Changeset bede27b for src/libcfa/concurrency/preemption.c

Timestamp:

Feb 9, 2018, 4:39:52 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

298ed08

Parents:

381fdee (diff), a722c7a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicts

File:

• src/libcfa/concurrency/preemption.c (modified) (14 diffs)

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  9 14:42:34 2018
-// Update Count     : 25
+// Last Modified On : Fri Feb  9 16:38:13 2018
+// Update Count     : 14
 //
 
@@ -67 +67 @@
 }
 
+enum {
+        PREEMPT_NORMAL    = 0,
+        PREEMPT_TERMINATE = 1,
+};
+
 //=============================================================================================
 // Kernel Preemption logic
@@ -192 +197 @@
 
         if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 }
@@ -203 +208 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 }
@@ -209 +214 @@
 // kill wrapper : signal a processor
 static void preempt( processor * this ) {
-        pthread_kill( this->kernel_thread, SIGUSR1 );
+        sigval_t value = { PREEMPT_NORMAL };
+        pthread_sigqueue( this->kernel_thread, SIGUSR1, value );
+}
+
+// kill wrapper : signal a processor
+void terminate(processor * this) {
+        this->do_terminate = true;
+        sigval_t value = { PREEMPT_TERMINATE };
+        pthread_sigqueue( this->kernel_thread, SIGUSR1, value );
 }
 
@@ -234 +247 @@
 // Called from kernel_startup
 void kernel_start_preemption() {
-        __cfaabi_dbg_print_safe("Kernel : Starting preemption\n");
+        __cfaabi_dbg_print_safe( "Kernel : Starting preemption\n" );
 
         // Start with preemption disabled until ready
@@ -255 +268 @@
 // Called from kernel_shutdown
 void kernel_stop_preemption() {
-        __cfaabi_dbg_print_safe("Kernel : Preemption stopping\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption stopping\n" );
 
         // Block all signals since we are already shutting down
@@ -271 +284 @@
         // Preemption is now fully stopped
 
-        __cfaabi_dbg_print_safe("Kernel : Preemption stopped\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption stopped\n" );
 }
 
@@ -299 +312 @@
         __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.CFA_REG_IP); )
 
+        // SKULLDUGGERY: if a thread creates a processor and the immediately deletes it,
+        // the interrupt that is supposed to force the kernel thread to preempt might arrive
+        // before the kernel thread has even started running. When that happens an iterrupt
+        // we a null 'this_processor' will be caught, just ignore it.
+        if(!this_processor) return;
+
+        choose(sfp->si_value.sival_int) {
+                case PREEMPT_NORMAL   : ;// Normal case, nothing to do here
+                case PREEMPT_TERMINATE: verify(this_processor->do_terminate);
+                default:
+                        abort( "internal error, signal value is %d", sfp->si_value.sival_int );
+        }
+
         // Check if it is safe to preempt here
         if( !preemption_ready() ) { return; }
 
-        __cfaabi_dbg_print_buffer_decl(" KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
+        __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
 
         preemption_in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
@@ -322 +348 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 
@@ -339 +365 @@
                                         continue;
                         case EINVAL :
-                                        abortf("Timeout was invalid.");
+                                        abort( "Timeout was invalid." );
                                 default:
-                                        abortf("Unhandled error %d", err);
+                                        abort( "Unhandled error %d", err);
                         }
                 }
@@ -348 +374 @@
                 assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
 
-                // __cfaabi_dbg_print_safe("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
+                // __cfaabi_dbg_print_safe( "Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
                 // Switch on the code (a.k.a. the sender) to
                 switch( info.si_code )
@@ -356 +382 @@
                 case SI_TIMER:
                 case SI_KERNEL:
-                        // __cfaabi_dbg_print_safe("Kernel : Preemption thread tick\n");
+                        // __cfaabi_dbg_print_safe( "Kernel : Preemption thread tick\n" );
                         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
                         tick_preemption();
@@ -370 +396 @@
 
 EXIT:
-        __cfaabi_dbg_print_safe("Kernel : Preemption thread stopping\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
         return NULL;
 }