Changes in libcfa/src/concurrency/coroutine.hfa [d4e68a6:ac2b598]

File:

• libcfa/src/concurrency/coroutine.hfa (modified) (12 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 17:49:39 2019
-// Update Count     : 9
+// Last Modified On : Tue Feb  4 12:29:26 2020
+// Update Count     : 11
 //
 
@@ -25 +25 @@
 trait is_coroutine(dtype T) {
       void main(T & this);
-      coroutine_desc * get_coroutine(T & this);
+      $coroutine * get_coroutine(T & this);
 };
 
-#define DECL_COROUTINE(X) static inline coroutine_desc* get_coroutine(X& this) { return &this.__cor; } void main(X& this)
+#define DECL_COROUTINE(X) static inline $coroutine* get_coroutine(X& this) { return &this.__cor; } void main(X& this)
 
 //-----------------------------------------------------------------------------
@@ -35 +35 @@
 // void ^?{}( coStack_t & this );
 
-void ?{}( coroutine_desc & this, const char * name, void * storage, size_t storageSize );
-void ^?{}( coroutine_desc & this );
+void  ?{}( $coroutine & this, const char name[], void * storage, size_t storageSize );
+void ^?{}( $coroutine & this );
 
-static inline void ?{}( coroutine_desc & this)                                       { this{ "Anonymous Coroutine", NULL, 0 }; }
-static inline void ?{}( coroutine_desc & this, size_t stackSize)                     { this{ "Anonymous Coroutine", NULL, stackSize }; }
-static inline void ?{}( coroutine_desc & this, void * storage, size_t storageSize )  { this{ "Anonymous Coroutine", storage, storageSize }; }
-static inline void ?{}( coroutine_desc & this, const char * name)                    { this{ name, NULL, 0 }; }
-static inline void ?{}( coroutine_desc & this, const char * name, size_t stackSize ) { this{ name, NULL, stackSize }; }
+static inline void ?{}( $coroutine & this)                                       { this{ "Anonymous Coroutine", 0p, 0 }; }
+static inline void ?{}( $coroutine & this, size_t stackSize)                     { this{ "Anonymous Coroutine", 0p, stackSize }; }
+static inline void ?{}( $coroutine & this, void * storage, size_t storageSize )  { this{ "Anonymous Coroutine", storage, storageSize }; }
+static inline void ?{}( $coroutine & this, const char name[])                    { this{ name, 0p, 0 }; }
+static inline void ?{}( $coroutine & this, const char name[], size_t stackSize ) { this{ name, 0p, stackSize }; }
 
 //-----------------------------------------------------------------------------
@@ -54 +54 @@
 void prime(T & cor);
 
-static inline struct coroutine_desc * active_coroutine() { return TL_GET( this_thread )->curr_cor; }
+static inline struct $coroutine * active_coroutine() { return TL_GET( this_thread )->curr_cor; }
 
 //-----------------------------------------------------------------------------
@@ -61 +61 @@
 // Start coroutine routines
 extern "C" {
-      forall(dtype T | is_coroutine(T))
-      void CtxInvokeCoroutine(T * this);
+        void __cfactx_invoke_coroutine(void (*main)(void *), void * this);
 
-      forall(dtype T | is_coroutine(T))
-      void CtxStart(T * this, void ( *invoke)(T *));
+        forall(dtype T)
+        void __cfactx_start(void (*main)(T &), struct $coroutine * cor, T & this, void (*invoke)(void (*main)(void *), void *));
 
-        extern void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc *) __attribute__ ((__noreturn__));
+        extern void __cfactx_coroutine_unwind(struct _Unwind_Exception * storage, struct $coroutine *) __attribute__ ((__noreturn__));
 
-        extern void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
+        extern void __cfactx_switch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("__cfactx_switch");
 }
 
 // Private wrappers for context switch and stack creation
 // Wrapper for co
-static inline void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
+static inline void $ctx_switch( $coroutine * src, $coroutine * dst ) __attribute__((nonnull (1, 2))) {
         // set state of current coroutine to inactive
         src->state = src->state == Halted ? Halted : Inactive;
@@ -83 +82 @@
         // context switch to specified coroutine
         verify( dst->context.SP );
-        CtxSwitch( &src->context, &dst->context );
-        // when CtxSwitch returns we are back in the src coroutine
+        __cfactx_switch( &src->context, &dst->context );
+        // when __cfactx_switch returns we are back in the src coroutine
 
         // set state of new coroutine to active
         src->state = Active;
 
-        if( unlikely(src->cancellation != NULL) ) {
-                _CtxCoroutine_Unwind(src->cancellation, src);
+        if( unlikely(src->cancellation != 0p) ) {
+                __cfactx_coroutine_unwind(src->cancellation, src);
         }
 }
@@ -103 +102 @@
         // will also migrate which means this value will
         // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
+        $coroutine * src = TL_GET( this_thread )->curr_cor;
 
         assertf( src->last != 0,
@@ -114 +113 @@
                 src->name, src, src->last->name, src->last );
 
-        CoroutineCtxSwitch( src, src->last );
+        $ctx_switch( src, src->last );
 }
 
@@ -125 +124 @@
         // will also migrate which means this value will
         // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
-        coroutine_desc * dst = get_coroutine(cor);
+        $coroutine * src = TL_GET( this_thread )->curr_cor;
+        $coroutine * dst = get_coroutine(cor);
 
-        if( unlikely(dst->context.SP == NULL) ) {
+        if( unlikely(dst->context.SP == 0p) ) {
+                TL_GET( this_thread )->curr_cor = dst;
                 __stack_prepare(&dst->stack, 65000);
-                CtxStart(&cor, CtxInvokeCoroutine);
+                __cfactx_start(main, dst, cor, __cfactx_invoke_coroutine);
+                TL_GET( this_thread )->curr_cor = src;
         }
 
@@ -146 +147 @@
 
         // always done for performance testing
-        CoroutineCtxSwitch( src, dst );
+        $ctx_switch( src, dst );
 
         return cor;
 }
 
-static inline void resume(coroutine_desc * dst) {
+static inline void resume( $coroutine * dst ) __attribute__((nonnull (1))) {
         // optimization : read TLS once and reuse it
         // Safety note: this is preemption safe since if
@@ -157 +158 @@
         // will also migrate which means this value will
         // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
+        $coroutine * src = TL_GET( this_thread )->curr_cor;
 
         // not resuming self ?
@@ -171 +172 @@
 
         // always done for performance testing
-        CoroutineCtxSwitch( src, dst );
+        $ctx_switch( src, dst );
 }