Changeset d3a804f5 for src/libcfa/concurrency/threads.c

Timestamp:

Feb 14, 2017, 1:19:28 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

97d246d

Parents:

f923b5f (diff), eafb094 (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:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/threads.c (modified) (6 diffs)

src/libcfa/concurrency/threads.c

@@ -17 +17 @@
 #include "threads"
 
-#include "kernel"
+#include "kernel_private.h"
 #include "libhdr.h"
 
@@ -24 +24 @@
 
 extern "C" {
+        #include <fenv.h>
         #include <stddef.h>
 }
@@ -43 +44 @@
         (&this->c){};
         this->c.name = "Anonymous Coroutine";
-        (&this->lock){};
+        (&this->terminated){};
         this->next = NULL;
 }
@@ -71 +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 ) {
@@ -91 +85 @@
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
 
-        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 ) {
-        thread_schedule( this_thread() );
-        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;
 }
@@ -130 +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 );    
         }
 }