Changeset e9e4e9ee for src/libcfa/concurrency/invoke.c

Timestamp:

Jan 19, 2017, 11:04:27 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, with_gc

Children:

2175062

Parents:

5ebb2fbc (diff), 68e6031 (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/invoke.c (modified) (4 diffs)

src/libcfa/concurrency/invoke.c

@@ -14 +14 @@
 
 extern void __suspend_no_inline__F___1(void);
+extern void __scheduler_remove__F_P9sthread_h__1(struct thread_h*);
 
 void CtxInvokeCoroutine(
@@ -20 +21 @@
       void *this
 ) {
-      LIB_DEBUG_PRINTF("Invoke Coroutine : Received %p (main %p, get_c %p)\n", this, main, get_coroutine);
+      // LIB_DEBUG_PRINTF("Invoke Coroutine : Received %p (main %p, get_c %p)\n", this, main, get_coroutine);
 
       struct coroutine* cor = get_coroutine( this );
@@ -42 +43 @@
       void *this
 ) {
-      LIB_DEBUG_PRINTF("Invoke Thread : Received %p (main %p, get_t %p)\n", this, main, get_thread);
+      // LIB_DEBUG_PRINTF("Invoke Thread : Received %p (main %p, get_t %p)\n", this, main, get_thread);
 
       __suspend_no_inline__F___1();
 
-      struct coroutine* cor = &get_thread( this )->c;
+      struct thread_h* thrd = get_thread( this );
+      struct coroutine* cor = &thrd->c;
       cor->state = Active;
 
-      LIB_DEBUG_PRINTF("Invoke Thread : invoking main %p (args %p)\n", main, this);
+      // LIB_DEBUG_PRINTF("Invoke Thread : invoking main %p (args %p)\n", main, this);
       main( this );
+
+      __scheduler_remove__F_P9sthread_h__1(thrd);
 
       //Final suspend, should never return
@@ -64 +68 @@
       void (*invoke)(void *)
 ) {
-      LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (main %p) to invoke (%p) from start (%p)\n", this, main, invoke, CtxStart);
+      // LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (main %p) to invoke (%p) from start (%p)\n", this, main, invoke, CtxStart);
 
       struct coStack_t* stack = &get_coroutine( this )->stack;