Changes in libcfa/src/concurrency/coroutine.cfa [2026bb6:427854b]

File:

• libcfa/src/concurrency/coroutine.cfa (modified) (9 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
 //
 
@@ -37 +37 @@
 
 extern "C" {
-        void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc *) __attribute__ ((__noreturn__));
+        void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct $coroutine *) __attribute__ ((__noreturn__));
         static void _CtxCoroutine_UnwindCleanup(_Unwind_Reason_Code, struct _Unwind_Exception *) __attribute__ ((__noreturn__));
         static void _CtxCoroutine_UnwindCleanup(_Unwind_Reason_Code, struct _Unwind_Exception *) {
@@ -89 +89 @@
 }
 
-void ?{}( coroutine_desc & this, const char * name, void * storage, size_t storageSize ) with( this ) {
-        (this.context){NULL, NULL};
+void ?{}( $coroutine & 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;
-}
-
-void ^?{}(coroutine_desc& this) {
+        starter = 0p;
+        last = 0p;
+        cancellation = 0p;
+}
+
+void ^?{}($coroutine& this) {
         if(this.state != Halted && this.state != Start && this.state != Primed) {
-                coroutine_desc * src = TL_GET( this_thread )->curr_cor;
-                coroutine_desc * dst = &this;
+                $coroutine * src = TL_GET( this_thread )->curr_cor;
+                $coroutine * dst = &this;
 
                 struct _Unwind_Exception storage;
@@ -115 +115 @@
                 }
 
-                CoroutineCtxSwitch( src, dst );
+                $ctx_switch( src, dst );
         }
 }
@@ -123 +123 @@
 forall(dtype T | is_coroutine(T))
 void prime(T& cor) {
-        coroutine_desc* this = get_coroutine(cor);
+        $coroutine* this = get_coroutine(cor);
         assert(this->state == Start);
 
@@ -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 ) {
-                coroutine_desc * starter = src->cancellation != 0 ? src->last : src->starter;
+        void __cfactx_cor_leave( struct $coroutine * src ) {
+                $coroutine * starter = src->cancellation != 0 ? src->last : src->starter;
 
                 src->state = Halted;
@@ -205 +201 @@
                         src->name, src, starter->name, starter );
 
-                CoroutineCtxSwitch( src, starter );
+                $ctx_switch( src, starter );
+        }
+
+        struct $coroutine * __cfactx_cor_finish(void) {
+                struct $coroutine * cor = kernelTLS.this_thread->curr_cor;
+
+                if(cor->state == Primed) {
+                        __cfactx_suspend();
+                }
+
+                cor->state = Active;
+
+                return cor;
         }
 }