Changeset 97f65d5 for src/libcfa/concurrency

Timestamp:

Feb 15, 2017, 8:13:49 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

e6512c8

Parents:

aa9ee19 (diff), 3149e7e (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:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• coroutines (modified) (3 diffs)
• coroutines.c (modified) (3 diffs)
• invoke.c (modified) (1 diff)
• invoke.h (modified) (4 diffs)
• kernel (modified) (5 diffs)
• kernel.c (modified) (18 diffs)
• kernel_private.h (added)
• threads.c (modified) (5 diffs)

src/libcfa/concurrency/coroutines

@@ -77 +77 @@
                 "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
                 src->name, src );
-        assertf( src->last->notHalted,
+        assertf( src->last->state != Halted,
                 "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
                 "Possible cause is terminated coroutine's main routine has already returned.",
@@ -98 +98 @@
       // not resuming self ?
         if ( src != dst ) {
-                assertf( dst->notHalted ,
+                assertf( dst->state != Halted ,
                         "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
                         "Possible cause is terminated coroutine's main routine has already returned.",
@@ -116 +116 @@
       // not resuming self ?
         if ( src != dst ) {
-                assertf( dst->notHalted ,
+                assertf( dst->state != Halted ,
                         "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
                         "Possible cause is terminated coroutine's main routine has already returned.",

src/libcfa/concurrency/coroutines.c

@@ -61 +61 @@
 
 void ?{}(coroutine* this) {
-        this->name = "Anonymous Coroutine";
-        this->errno_ = 0;
-        this->state = Start;
-      this->notHalted = true;
-        this->starter = NULL;
-        this->last = NULL;
+        this{ "Anonymous Coroutine" };
 }
 
@@ -73 +68 @@
         this->errno_ = 0;
         this->state = Start;
-      this->notHalted = true;
         this->starter = NULL;
         this->last = NULL;
@@ -169 +163 @@
         this->context = this->base;
         this->top = (char *)this->context + cxtSize;
-
-        LIB_DEBUG_PRINTF("Coroutine : created stack %p\n", this->base);
 }
 

src/libcfa/concurrency/invoke.c

@@ -48 +48 @@
       main( this );
 
-      cor->state = Halt;
-      cor->notHalted = false;
+      cor->state = Halted;
 
       //Final suspend, should never return

src/libcfa/concurrency/invoke.h

@@ -30 +30 @@
       #define SCHEDULER_CAPACITY 10
 
+      struct spinlock {
+            volatile int lock;
+      };
+
       struct simple_thread_list {
             struct thread * head;
             struct thread ** tail;
+      };
+
+      struct signal_once {
+            volatile bool condition;
+            struct spinlock lock;
+            struct simple_thread_list blocked;
       };
 
@@ -40 +50 @@
             void append( struct simple_thread_list *, struct thread * );
             struct thread * pop_head( struct simple_thread_list * );
+
+            void ?{}(spinlock * this);
+            void ^?{}(spinlock * this);
+
+            void ?{}(signal_once * this);
+            void ^?{}(signal_once * this);
       }
       #endif
@@ -53 +69 @@
       };
 
-      enum coroutine_state { Start, Inactive, Active, Halt, Primed };
+      enum coroutine_state { Halted, Start, Inactive, Active, Primed };
 
       struct coroutine {
@@ -60 +76 @@
             int errno_;                         // copy of global UNIX variable errno
             enum coroutine_state state; // current execution status for coroutine
-            bool notHalted;                     // indicate if execuation state is not halted
-
             struct coroutine *starter;  // first coroutine to resume this one
             struct coroutine *last;             // last coroutine to resume this one
       };
 
-      struct simple_lock {
-        struct simple_thread_list blocked;
-      };
-
       struct thread {
-            struct coroutine c;
-            struct simple_lock lock;
-            struct thread * next;
+            struct coroutine c;           // coroutine body used to store context
+            struct signal_once terminated;// indicate if execuation state is not halted
+            struct thread * next;         // instrusive link field for threads
       };
 

src/libcfa/concurrency/kernel

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2016
+// Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Thierry Delisle
 // Last Modified On : --
@@ -27 +27 @@
 
 //-----------------------------------------------------------------------------
+// Locks
+void lock( spinlock * );
+void unlock( spinlock * );
+
+void wait( signal_once * );
+void signal( signal_once * );
+
+//-----------------------------------------------------------------------------
 // Cluster
 struct cluster {
         simple_thread_list ready_queue;
-        // pthread_spinlock_t lock;
+        spinlock lock;
 };
 
@@ -38 +46 @@
 //-----------------------------------------------------------------------------
 // Processor
-enum ProcessorAction { 
-        Reschedule,
-        NoAction
+enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule };
+struct FinishAction {
+        FinishOpCode action_code;
+        thread * thrd;
+        spinlock * lock;
 };
+static inline void ?{}(FinishAction * this) { 
+        this->action_code = No_Action;
+        this->thrd = NULL;
+        this->lock = NULL;
+}
+static inline void ^?{}(FinishAction * this) {}
 
 struct processor {
@@ -49 +65 @@
         thread * current_thread;
         pthread_t kernel_thread;
-        simple_lock lock;
-        volatile bool terminated;
-        ProcessorAction thread_action;
+        
+        signal_once terminated;
+        volatile bool is_terminated;
+
+        struct FinishAction finish;
 };
 
@@ -57 +75 @@
 void ?{}(processor * this, cluster * cltr);
 void ^?{}(processor * this);
-
-
-//-----------------------------------------------------------------------------
-// Locks
-
-void ?{}(simple_lock * this);
-void ^?{}(simple_lock * this);
-
-void lock( simple_lock * );
-void unlock( simple_lock * );
 
 #endif //KERNEL_H

src/libcfa/concurrency/kernel.c

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2016
+// Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Thierry Delisle
 // Last Modified On : --
@@ -20 +20 @@
 
 //Header
-#include "kernel"
+#include "kernel_private.h"
 
 //C Includes
@@ -31 +31 @@
 //CFA Includes
 #include "libhdr.h"
-#include "threads"
 
 //Private includes
@@ -37 +36 @@
 #include "invoke.h"
 
-static volatile int lock;
-
-void spin_lock( volatile int *lock ) {
-        for ( unsigned int i = 1;; i += 1 ) {
-          if ( *lock == 0 && __sync_lock_test_and_set_4( lock, 1 ) == 0 ) break;
-        }
-}
-
-void spin_unlock( volatile int *lock ) {
-        __sync_lock_release_4( lock );
-}
-
 //-----------------------------------------------------------------------------
 // Kernel storage
-struct processorCtx_t {
-        processor * proc;
-        coroutine c;
-};
-
-DECL_COROUTINE(processorCtx_t);
-
 #define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]
 
@@ -127 +107 @@
         this->name = "Main Thread";
         this->errno_ = 0;
-        this->state = Inactive;
-        this->notHalted = true;
+        this->state = Start;
 }
 
@@ -149 +128 @@
 }
 
-void start(processor * this);
-
 void ?{}(processor * this) {
         this{ systemCluster };
@@ -159 +136 @@
         this->current_coroutine = NULL;
         this->current_thread = NULL;
-        (&this->lock){};
-        this->terminated = false;
+        (&this->terminated){};
+        this->is_terminated = false;
 
         start( this );
@@ -169 +146 @@
         this->current_coroutine = NULL;
         this->current_thread = NULL;
-        (&this->lock){};
-        this->terminated = false;
+        (&this->terminated){};
+        this->is_terminated = false;
 
         this->runner = runner;
@@ -178 +155 @@
 
 void ^?{}(processor * this) {
-        if( ! this->terminated ) {
+        if( ! this->is_terminated ) {
                 LIB_DEBUG_PRINTF("Kernel : core %p signaling termination\n", this);
-                this->terminated = true;
-                lock( &this->lock );
+                this->is_terminated = true;
+                wait( &this->terminated );
         }
 }
@@ -187 +164 @@
 void ?{}(cluster * this) {
         ( &this->ready_queue ){};
-        lock = 0;
+        ( &this->lock ){};
 }
 
@@ -194 +171 @@
 }
 
-//-----------------------------------------------------------------------------
-// Processor running routines
-void main(processorCtx_t *);
-thread * nextThread(cluster * this);
-void scheduleInternal(processor * this, thread * dst);
-void spin(processor * this, unsigned int * spin_count);
-void thread_schedule( thread * thrd );
-
+//=============================================================================================
+// Kernel Scheduling logic
+//=============================================================================================
 //Main of the processor contexts
 void main(processorCtx_t * runner) {
@@ -207 +179 @@
         LIB_DEBUG_PRINTF("Kernel : core %p starting\n", this);
 
-        fenv_t envp;
-        fegetenv( &envp );
-        LIB_DEBUG_PRINTF("Kernel : mxcsr %x\n", envp.__mxcsr);
-
         thread * readyThread = NULL;
-        for( unsigned int spin_count = 0; ! this->terminated; spin_count++ ) {
-                
+        for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ ) 
+        {
                 readyThread = nextThread( this->cltr );
 
-                if(readyThread) {
-                        scheduleInternal(this, readyThread);
+                if(readyThread) 
+                {
+                        runThread(this, readyThread);
+
+                        //Some actions need to be taken from the kernel
+                        finishRunning(this);
+
                         spin_count = 0;
-                } else {
+                } 
+                else 
+                {
                         spin(this, &spin_count);
                 }               
@@ -225 +200 @@
 
         LIB_DEBUG_PRINTF("Kernel : core %p unlocking thread\n", this);
-        unlock( &this->lock );
+        signal( &this->terminated );
         LIB_DEBUG_PRINTF("Kernel : core %p terminated\n", this);
 }
 
-//Declarations for scheduleInternal
-extern void ThreadCtxSwitch(coroutine * src, coroutine * dst);
-
-// scheduleInternal runs a thread by context switching 
+// runThread runs a thread by context switching 
 // from the processor coroutine to the target thread 
-void scheduleInternal(processor * this, thread * dst) {
-        this->thread_action = NoAction;
-
-        // coroutine * proc_ctx = get_coroutine(this->ctx);
-        // coroutine * thrd_ctx = get_coroutine(dst);
-
-        // //Update global state
-        // this->current_thread = dst;
-
-        // // Context Switch to the thread
-        // ThreadCtxSwitch(proc_ctx, thrd_ctx);
-        // // when ThreadCtxSwitch returns we are back in the processor coroutine
-
-        coroutine * proc_ctx = get_coroutine(this->runner);
-        coroutine * thrd_ctx = get_coroutine(dst);
-      thrd_ctx->last = proc_ctx;
- 
-      // context switch to specified coroutine
-      // Which is now the current_coroutine
-      // LIB_DEBUG_PRINTF("Kernel : switching to ctx %p (from %p, current %p)\n", thrd_ctx, proc_ctx, this->current_coroutine);
-      this->current_thread = dst;
-      this->current_coroutine = thrd_ctx;
-      CtxSwitch( proc_ctx->stack.context, thrd_ctx->stack.context );
-      this->current_coroutine = proc_ctx;
-      // LIB_DEBUG_PRINTF("Kernel : returned from ctx %p (to %p, current %p)\n", thrd_ctx, proc_ctx, this->current_coroutine);
- 
-      // when CtxSwitch returns we are back in the processor coroutine
-        if(this->thread_action == Reschedule) {
-                thread_schedule( dst );
+void runThread(processor * this, thread * dst) {
+        coroutine * proc_cor = get_coroutine(this->runner);
+        coroutine * thrd_cor = get_coroutine(dst);
+        
+        //Reset the terminating actions here
+        this->finish.action_code = No_Action;
+
+        //Update global state
+        this->current_thread = dst;
+
+        // Context Switch to the thread
+        ThreadCtxSwitch(proc_cor, thrd_cor);
+        // when ThreadCtxSwitch returns we are back in the processor coroutine
+}
+
+// Once a thread has finished running, some of 
+// its final actions must be executed from the kernel
+void finishRunning(processor * this) {
+        if( this->finish.action_code == Release ) {
+                unlock( this->finish.lock );
+        }
+        else if( this->finish.action_code == Schedule ) {
+                ScheduleThread( this->finish.thrd );
+        }
+        else if( this->finish.action_code == Release_Schedule ) {
+                unlock( this->finish.lock );            
+                ScheduleThread( this->finish.thrd );
+        }
+        else {
+                assert(this->finish.action_code == No_Action);
         }
 }
@@ -301 +274 @@
         proc_cor_storage.c.state = Active;
       main( &proc_cor_storage );
-      proc_cor_storage.c.state = Halt;
-      proc_cor_storage.c.notHalted = false;
+      proc_cor_storage.c.state = Halted;
 
         // Main routine of the core returned, the core is now fully terminated
@@ -325 +297 @@
 //-----------------------------------------------------------------------------
 // Scheduler routines
-void thread_schedule( thread * thrd ) {
+void ScheduleThread( thread * thrd ) {
         assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
-        spin_lock( &lock );
+        lock( &systemProcessor->cltr->lock );
         append( &systemProcessor->cltr->ready_queue, thrd );
-        spin_unlock( &lock );
+        unlock( &systemProcessor->cltr->lock );
 }
 
 thread * nextThread(cluster * this) {
-        spin_lock( &lock );
+        lock( &this->lock );
         thread * head = pop_head( &this->ready_queue );
-        spin_unlock( &lock );
+        unlock( &this->lock );
         return head;
+}
+
+void ScheduleInternal() {
+        suspend();
+}
+
+void ScheduleInternal( spinlock * lock ) {
+        get_this_processor()->finish.action_code = Release;
+        get_this_processor()->finish.lock = lock;
+        suspend();
+}
+
+void ScheduleInternal( thread * thrd ) {
+        get_this_processor()->finish.action_code = Schedule;
+        get_this_processor()->finish.thrd = thrd;
+        suspend();
+}
+
+void ScheduleInternal( spinlock * lock, thread * thrd ) {
+        get_this_processor()->finish.action_code = Release_Schedule;
+        get_this_processor()->finish.lock = lock;
+        get_this_processor()->finish.thrd = thrd;
+        suspend();
 }
 
@@ -363 +358 @@
         // Add the main thread to the ready queue 
         // once resume is called on systemProcessor->ctx the mainThread needs to be scheduled like any normal thread
-        thread_schedule(mainThread);
+        ScheduleThread(mainThread);
 
         //initialize the global state variables
@@ -387 +382 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
-        systemProcessor->terminated = true;
+        systemProcessor->is_terminated = true;
         suspend();
 
@@ -406 +401 @@
 //-----------------------------------------------------------------------------
 // Locks
-void ?{}( simple_lock * this ) {
-        ( &this->blocked ){};
-}
-
-void ^?{}( simple_lock * this ) {
-
-}
-
-void lock( simple_lock * this ) {
+void ?{}( spinlock * this ) {
+        this->lock = 0;
+}
+void ^?{}( spinlock * this ) {
+
+}
+
+void lock( spinlock * this ) {
+        for ( unsigned int i = 1;; i += 1 ) {
+                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) break;
+        }
+}
+
+void unlock( spinlock * this ) {
+        __sync_lock_release_4( &this->lock );
+}
+
+void ?{}( signal_once * this ) {
+        this->condition = false;
+}
+void ^?{}( signal_once * this ) {
+
+}
+
+void wait( signal_once * this ) {
+        lock( &this->lock );
+        if( !this->condition ) {
+                append( &this->blocked, this_thread() );
+                ScheduleInternal( &this->lock );
+                lock( &this->lock );
+        }
+        unlock( &this->lock );
+}
+
+void signal( signal_once * this ) {
+        lock( &this->lock );
         {
-                spin_lock( &lock );
-                append( &this->blocked, this_thread() );
-                spin_unlock( &lock );
-        }
-        suspend();
-}
-
-void unlock( simple_lock * this ) {
-        thread * it;
-        while( it = pop_head( &this->blocked) ) {
-                thread_schedule( it );
-        }
+                this->condition = true;
+
+                thread * it;
+                while( it = pop_head( &this->blocked) ) {
+                        ScheduleThread( it );
+                }
+        }
+        unlock( &this->lock );
 }
 

src/libcfa/concurrency/threads.c

@@ -17 +17 @@
 #include "threads"
 
-#include "kernel"
+#include "kernel_private.h"
 #include "libhdr.h"
 
@@ -44 +44 @@
         (&this->c){};
         this->c.name = "Anonymous Coroutine";
-        (&this->lock){};
+        (&this->terminated){};
         this->next = NULL;
 }
@@ -72 +72 @@
 //-----------------------------------------------------------------------------
 // Starting and stopping threads
-extern "C" {
-      forall(dtype T | is_thread(T))
-      void CtxInvokeThread(T * this);
-}
-
-extern void thread_schedule( thread * );
-
 forall( dtype T | is_thread(T) )
 void start( T* this ) {
@@ -92 +85 @@
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
 
-        fenv_t envp;
-        fegetenv( &envp );
-        LIB_DEBUG_PRINTF("Thread : mxcsr %x\n", envp.__mxcsr);
-        LIB_DEBUG_PRINTF("Thread started : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
-
-        thread_schedule(thrd_h);
+        ScheduleThread(thrd_h);
 }
 
 forall( dtype T | is_thread(T) )
 void stop( T* this ) {
-        thread*  thrd = get_thread(this);
-        if( thrd->c.notHalted ) {
-                lock( &thrd->lock );
-        }
+        wait( & get_thread(this)->terminated ); 
 }
 
 void yield( void ) {
-        get_this_processor()->thread_action = Reschedule;
-        suspend();
+        ScheduleInternal( get_this_processor()->current_thread );
 }
 
 void ThreadCtxSwitch(coroutine* src, coroutine* dst) {
+        // set state of current coroutine to inactive
+        src->state = Inactive;
+        dst->state = Active;
+
+        //update the last resumer
         dst->last = src;
 
-        // set state of current coroutine to inactive
-        src->state = Inactive;
-
-        // set new coroutine that task is executing
+        // set new coroutine that the processor is executing
+        // and context switch to it
         get_this_processor()->current_coroutine = dst;  
-
-        // context switch to specified coroutine
         CtxSwitch( src->stack.context, dst->stack.context );
-        // when CtxSwitch returns we are back in the src coroutine
+        get_this_processor()->current_coroutine = src;  
 
         // set state of new coroutine to active
+        dst->state = Inactive;
         src->state = Active;
 }
@@ -134 +120 @@
 extern "C" {
         void __thread_signal_termination( thread * this ) {
-                this->c.state = Halt;
-                this->c.notHalted = false;
-                unlock( &this->lock );
+                this->c.state = Halted;
+                LIB_DEBUG_PRINTF("Thread end : %p\n", this);
+                signal( &this->terminated );    
         }
 }