Changeset 349b2cb for src/libcfa/concurrency/thread.c

Timestamp:

Mar 22, 2017, 11:28:47 AM (7 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, with_gc

Children:

9c14ae9

Parents:

597db97 (diff), a53e10a (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

File:

• src/libcfa/concurrency/thread.c (modified) (5 diffs)

src/libcfa/concurrency/thread.c

@@ -35 +35 @@
 void start( T* this );
 
-forall( dtype T | is_thread(T) )
-void stop( T* this );
-
 //-----------------------------------------------------------------------------
 // Thread ctors and dtors
@@ -44 +41 @@
         (&this->cor){};
         this->cor.name = "Anonymous Coroutine";
-        (&this->terminated){};
+        this->mon.owner = this;
+        this->mon.recursion = 1;
         this->next = NULL;
 }
@@ -66 +64 @@
 forall( dtype T | sized(T) | is_thread(T) )
 void ^?{}( scoped(T)* this ) {
-        stop(&this->handle);
         ^(&this->handle){};
 }
@@ -86 +83 @@
 
         ScheduleThread(thrd_h);
-}
-
-forall( dtype T | is_thread(T) )
-void stop( T* this ) {
-        wait( & get_thread(this)->terminated ); 
 }
 
@@ -116 +108 @@
 }
 
-// C Helper to signal the termination of a thread_desc
-// Used in invoke.c
-extern "C" {
-        void __thread_signal_termination( thread_desc * this ) {
-                this->cor.state = Halted;
-                LIB_DEBUG_PRINTF("Thread end : %p\n", this);
-                signal( &this->terminated );    
-        }
-}
-
 // Local Variables: //
 // mode: c //