Changes in libcfa/src/concurrency/coroutine.cfa [ac2b598:e3fea42]

File:

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

libcfa/src/concurrency/coroutine.cfa

@@ -37 +37 @@
 
 extern "C" {
-        void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct $coroutine *) __attribute__ ((__noreturn__));
+        void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc *) __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 & this, const char name[], void * storage, size_t storageSize ) with( this ) {
+void ?{}( coroutine_desc & this, const char name[], void * storage, size_t storageSize ) with( this ) {
         (this.context){0p, 0p};
         (this.stack){storage, storageSize};
@@ -99 +99 @@
 }
 
-void ^?{}($coroutine& this) {
+void ^?{}(coroutine_desc& this) {
         if(this.state != Halted && this.state != Start && this.state != Primed) {
-                $coroutine * src = TL_GET( this_thread )->curr_cor;
-                $coroutine * dst = &this;
+                coroutine_desc * src = TL_GET( this_thread )->curr_cor;
+                coroutine_desc * dst = &this;
 
                 struct _Unwind_Exception storage;
@@ -115 +115 @@
                 }
 
-                $ctx_switch( src, dst );
+                CoroutineCtxSwitch( src, dst );
         }
 }
@@ -123 +123 @@
 forall(dtype T | is_coroutine(T))
 void prime(T& cor) {
-        $coroutine* this = get_coroutine(cor);
+        coroutine_desc* this = get_coroutine(cor);
         assert(this->state == Start);
 
@@ -187 +187 @@
 // is not inline (We can't inline Cforall in C)
 extern "C" {
-        void __cfactx_cor_leave( struct $coroutine * src ) {
-                $coroutine * starter = src->cancellation != 0 ? src->last : src->starter;
+        void __suspend_internal(void) {
+                suspend();
+        }
+
+        void __leave_coroutine( coroutine_desc * src ) {
+                coroutine_desc * starter = src->cancellation != 0 ? src->last : src->starter;
 
                 src->state = Halted;
@@ -201 +205 @@
                         src->name, src, starter->name, starter );
 
-                $ctx_switch( src, starter );
-        }
-
-        struct $coroutine * __cfactx_cor_finish(void) {
-                struct $coroutine * cor = kernelTLS.this_thread->curr_cor;
-
-                if(cor->state == Primed) {
-                        suspend();
-                }
-
-                cor->state = Active;
-
-                return cor;
+                CoroutineCtxSwitch( src, starter );
         }
 }