Changeset bede27b for src/libcfa/concurrency

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

Location:

src/libcfa/concurrency

Files:

• coroutine.c (modified) (3 diffs)
• invoke.c (modified) (3 diffs)
• kernel.c (modified) (1 diff)
• kernel_private.h (modified) (1 diff)
• monitor.c (modified) (31 diffs)
• preemption.c (modified) (14 diffs)

src/libcfa/concurrency/coroutine.c

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:34:57 2017
-// Update Count     : 1
+// Last Modified On : Thu Feb  8 16:10:31 2018
+// Update Count     : 4
 //
 
@@ -77 +77 @@
                 __cfaabi_dbg_debug_do(
                         if ( mprotect( this.storage, pageSize, PROT_READ | PROT_WRITE ) == -1 ) {
-                                abortf( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
+                                abort( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
                         }
                 );
@@ -135 +135 @@
                 __cfaabi_dbg_debug_do(
                         if ( mprotect( storage, pageSize, PROT_NONE ) == -1 ) {
-                                abortf( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) );
+                                abort( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) );
                         } // if
                 );
 
                 if ( (intptr_t)storage == 0 ) {
-                        abortf( "Attempt to allocate %d bytes of storage for coroutine or task execution-state but insufficient memory available.", size );
+                        abort( "Attempt to allocate %zd bytes of storage for coroutine or task execution-state but insufficient memory available.", size );
                 } // if
 

src/libcfa/concurrency/invoke.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  9 14:41:56 2018
-// Update Count     : 3
+// Last Modified On : Fri Feb  9 16:37:42 2018
+// Update Count     : 5
 //
 
@@ -51 +51 @@
         //Final suspend, should never return
         __leave_coroutine();
-        abortf("Resumed dead coroutine");
+        __cabi_abort( "Resumed dead coroutine" );
 }
 
@@ -81 +81 @@
         //Final suspend, should never return
         __leave_thread_monitor( thrd );
-        abortf("Resumed dead thread");
+        __cabi_abort( "Resumed dead thread" );
 }
 

src/libcfa/concurrency/kernel.c

@@ -168 +168 @@
         if( ! do_terminate ) {
                 __cfaabi_dbg_print_safe("Kernel : core %p signaling termination\n", &this);
-                do_terminate = true;
+                terminate(&this);
                 P( terminated );
                 pthread_join( kernel_thread, NULL );

src/libcfa/concurrency/kernel_private.h

@@ -60 +60 @@
 void runThread(processor * this, thread_desc * dst);
 void finishRunning(processor * this);
+void terminate(processor * this);
 void spin(processor * this, unsigned int * spin_count);
 

src/libcfa/concurrency/monitor.c

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 31 14:59:05 2017
-// Update Count     : 3
+// Last Modified On : Thu Feb  8 16:12:20 2018
+// Update Count     : 4
 //
 
@@ -87 +87 @@
                 thread_desc * thrd = this_thread;
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
 
                 if( !this->owner ) {
@@ -93 +93 @@
                         set_owner( this, thrd );
 
-                        __cfaabi_dbg_print_safe("Kernel :  mon is free \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon is free \n" );
                 }
                 else if( this->owner == thrd) {
@@ -99 +99 @@
                         this->recursion += 1;
 
-                        __cfaabi_dbg_print_safe("Kernel :  mon already owned \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon already owned \n" );
                 }
                 else if( is_accepted( this, group) ) {
@@ -108 +108 @@
                         reset_mask( this );
 
-                        __cfaabi_dbg_print_safe("Kernel :  mon accepts \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon accepts \n" );
                 }
                 else {
-                        __cfaabi_dbg_print_safe("Kernel :  blocking \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
 
                         // Some one else has the monitor, wait in line for it
@@ -118 +118 @@
                         BlockInternal( &this->lock );
 
-                        __cfaabi_dbg_print_safe("Kernel : %10p Entered  mon %p\n", thrd, this);
+                        __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
 
                         // BlockInternal will unlock spinlock, no need to unlock ourselves
@@ -124 +124 @@
                 }
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Entered  mon %p\n", thrd, this);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
 
                 // Release the lock and leave
@@ -136 +136 @@
                 thread_desc * thrd = this_thread;
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
 
 
                 if( !this->owner ) {
-                        __cfaabi_dbg_print_safe("Kernel : Destroying free mon %p\n", this);
+                        __cfaabi_dbg_print_safe( "Kernel : Destroying free mon %p\n", this);
 
                         // No one has the monitor, just take it
@@ -151 +151 @@
                         // We already have the monitor... but where about to destroy it so the nesting will fail
                         // Abort!
-                        abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");
+                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex." );
                 }
 
@@ -158 +158 @@
                 __monitor_group_t group = { &this, 1, func };
                 if( is_accepted( this, group) ) {
-                        __cfaabi_dbg_print_safe("Kernel :  mon accepts dtor, block and signal it \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon accepts dtor, block and signal it \n" );
 
                         // Wake the thread that is waiting for this
@@ -177 +177 @@
                 }
                 else {
-                        __cfaabi_dbg_print_safe("Kernel :  blocking \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
 
                         wait_ctx( this_thread, 0 )
@@ -190 +190 @@
                 }
 
-                __cfaabi_dbg_print_safe("Kernel : Destroying %p\n", this);
+                __cfaabi_dbg_print_safe( "Kernel : Destroying %p\n", this);
 
         }
@@ -199 +199 @@
                 lock( this->lock __cfaabi_dbg_ctx2 );
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
 
                 verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", this_thread, this->owner, this->recursion, this );
@@ -209 +209 @@
                 // it means we don't need to do anything
                 if( this->recursion != 0) {
-                        __cfaabi_dbg_print_safe("Kernel :  recursion still %d\n", this->recursion);
+                        __cfaabi_dbg_print_safe( "Kernel :  recursion still %d\n", this->recursion);
                         unlock( this->lock );
                         return;
@@ -228 +228 @@
                 __cfaabi_dbg_debug_do(
                         if( this_thread != this->owner ) {
-                                abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
+                                abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
                         }
                         if( this->recursion != 1 ) {
-                                abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
+                                abort( "Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
                         }
                 )
@@ -256 +256 @@
                 // If we haven't left the last level of recursion
                 // it must mean there is an error
-                if( this->recursion != 0) { abortf("Thread internal monitor has unbalanced recursion"); }
+                if( this->recursion != 0) { abort( "Thread internal monitor has unbalanced recursion" ); }
 
                 // Fetch the next thread, can be null
@@ -302 +302 @@
         (this_thread->monitors){m, count, func};
 
-        // __cfaabi_dbg_print_safe("MGUARD : enter %d\n", count);
+        // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count);
 
         // Enter the monitors in order
@@ -308 +308 @@
         enter( group );
 
-        // __cfaabi_dbg_print_safe("MGUARD : entered\n");
+        // __cfaabi_dbg_print_safe( "MGUARD : entered\n" );
 }
 
@@ -314 +314 @@
 // Dtor for monitor guard
 void ^?{}( monitor_guard_t & this ) {
-        // __cfaabi_dbg_print_safe("MGUARD : leaving %d\n", this.count);
+        // __cfaabi_dbg_print_safe( "MGUARD : leaving %d\n", this.count);
 
         // Leave the monitors in order
         leave( this.m, this.count );
 
-        // __cfaabi_dbg_print_safe("MGUARD : left\n");
+        // __cfaabi_dbg_print_safe( "MGUARD : left\n" );
 
         // Restore thread context
@@ -427 +427 @@
                 thread_desc * this_thrd = this_thread;
                 if ( this.monitor_count != this_thrd->monitors.size ) {
-                        abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
+                        abort( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
                 }
 
                 for(int i = 0; i < this.monitor_count; i++) {
                         if ( this.monitors[i] != this_thrd->monitors[i] ) {
-                                abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
+                                abort( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
                         }
                 }
@@ -534 +534 @@
         if(actual_count == 0) return;
 
-        __cfaabi_dbg_print_buffer_local( "Kernel : waitfor internal proceeding\n");
+        __cfaabi_dbg_print_buffer_local( "Kernel : waitfor internal proceeding\n" );
 
         // Create storage for monitor context
@@ -551 +551 @@
                         __acceptable_t& accepted = mask[index];
                         if( accepted.is_dtor ) {
-                                __cfaabi_dbg_print_buffer_local( "Kernel : dtor already there\n");
+                                __cfaabi_dbg_print_buffer_local( "Kernel : dtor already there\n" );
                                 verifyf( accepted.size == 1,  "ERROR: Accepted dtor has more than 1 mutex parameter." );
 
@@ -563 +563 @@
                         }
                         else {
-                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, baton-passing\n");
+                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, baton-passing\n" );
 
                                 // Create the node specific to this wait operation
@@ -577 +577 @@
                                         }
                                 #endif
-                                __cfaabi_dbg_print_buffer_local( "\n");
+                                __cfaabi_dbg_print_buffer_local( "\n" );
 
                                 // Set the owners to be the next thread
@@ -588 +588 @@
                                 monitor_restore;
 
-                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, returned\n");
+                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, returned\n" );
                         }
 
@@ -598 +598 @@
 
         if( duration == 0 ) {
-                __cfaabi_dbg_print_buffer_local( "Kernel : non-blocking, exiting\n");
+                __cfaabi_dbg_print_buffer_local( "Kernel : non-blocking, exiting\n" );
 
                 unlock_all( locks, count );
@@ -607 +607 @@
 
 
-        verifyf( duration < 0, "Timeout on waitfor statments not supported yet.");
-
-        __cfaabi_dbg_print_buffer_local( "Kernel : blocking waitfor\n");
+        verifyf( duration < 0, "Timeout on waitfor statments not supported yet." );
+
+        __cfaabi_dbg_print_buffer_local( "Kernel : blocking waitfor\n" );
 
         // Create the node specific to this wait operation
@@ -631 +631 @@
         monitor_restore;
 
-        __cfaabi_dbg_print_buffer_local( "Kernel : exiting\n");
+        __cfaabi_dbg_print_buffer_local( "Kernel : exiting\n" );
 
         __cfaabi_dbg_print_buffer_local( "Kernel : accepted %d\n", *mask.accepted);
@@ -640 +640 @@
 
 static inline void set_owner( monitor_desc * this, thread_desc * owner ) {
-        // __cfaabi_dbg_print_safe("Kernal :   Setting owner of %p to %p ( was %p)\n", this, owner, this->owner );
+        // __cfaabi_dbg_print_safe( "Kernal :   Setting owner of %p to %p ( was %p)\n", this, owner, this->owner );
 
         //Pass the monitor appropriately
@@ -672 +672 @@
 static inline thread_desc * next_thread( monitor_desc * this ) {
         //Check the signaller stack
-        __cfaabi_dbg_print_safe("Kernel :  mon %p AS-stack top %p\n", this, this->signal_stack.top);
+        __cfaabi_dbg_print_safe( "Kernel :  mon %p AS-stack top %p\n", this, this->signal_stack.top);
         __condition_criterion_t * urgent = pop( this->signal_stack );
         if( urgent ) {
@@ -814 +814 @@
         thread_desc * thrd = this_thread;
         if( !this.monitors ) {
-                // __cfaabi_dbg_print_safe("Branding\n");
+                // __cfaabi_dbg_print_safe( "Branding\n" );
                 assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data );
                 this.monitor_count = thrd->monitors.size;

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;
 }