Changeset 52142c2 for libcfa/src/concurrency/coroutine.cfa

Timestamp:

Feb 4, 2020, 2:03:19 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

74e3263

Parents:

e3fea42 (diff), 4f7b418 (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:

• libcfa/src/concurrency/coroutine.cfa (modified) (2 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -187 +187 @@
 // is not inline (We can't inline Cforall in C)
 extern "C" {
-        void __suspend_internal(void) {
-                suspend();
-        }
-
-        void __leave_coroutine( coroutine_desc * src ) {
+        void __leave_coroutine( struct coroutine_desc * src ) {
                 coroutine_desc * starter = src->cancellation != 0 ? src->last : src->starter;
 
@@ -207 +203 @@
                 CoroutineCtxSwitch( src, starter );
         }
+
+        struct coroutine_desc * __finish_coroutine(void) {
+                struct coroutine_desc * cor = kernelTLS.this_thread->curr_cor;
+
+                if(cor->state == Primed) {
+                        suspend();
+                }
+
+                cor->state = Active;
+
+                return cor;
+        }
 }