Changeset 3b56166 for libcfa/src/concurrency/coroutine.cfa

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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) (6 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 17:20:57 2018
-// Update Count     : 9
+// Last Modified On : Tue Feb  4 12:29:25 2020
+// Update Count     : 16
 //
 
@@ -89 +89 @@
 }
 
-void ?{}( coroutine_desc & this, const char * name, void * storage, size_t storageSize ) with( this ) {
-        (this.context){NULL, NULL};
+void ?{}( coroutine_desc & this, const char name[], void * storage, size_t storageSize ) with( this ) {
+        (this.context){0p, 0p};
         (this.stack){storage, storageSize};
         this.name = name;
         state = Start;
-        starter = NULL;
-        last = NULL;
-        cancellation = NULL;
+        starter = 0p;
+        last = 0p;
+        cancellation = 0p;
 }
 
@@ -131 +131 @@
 
 [void *, size_t] __stack_alloc( size_t storageSize ) {
-        static const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
+        const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
         assert(__page_size != 0l);
         size_t size = libCeiling( storageSize, 16 ) + stack_data_size;
@@ -157 +157 @@
 
 void __stack_prepare( __stack_info_t * this, size_t create_size ) {
-        static const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
+        const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
         bool userStack;
         void * storage;
@@ -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;
+        }
 }