Changeset 933f32f for libcfa/src/concurrency/coroutine.hfa

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

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

libcfa/src/concurrency/coroutine.hfa

@@ -46 +46 @@
 //-----------------------------------------------------------------------------
 // Public coroutine API
-static inline void suspend();
+static inline void suspend(void);
 
 forall(dtype T | is_coroutine(T))
-static inline void resume(T & cor);
+static inline T & resume(T & cor);
 
 forall(dtype T | is_coroutine(T))
@@ -64 +64 @@
       forall(dtype T | is_coroutine(T))
       void CtxStart(T * this, void ( *invoke)(T *));
+
+        extern void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc *) __attribute__ ((__noreturn__));
+
+        extern void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
 }
 
 // Private wrappers for context switch and stack creation
-extern void CoroutineCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
-extern void create_stack( coStack_t * this, unsigned int storageSize );
+// Wrapper for co
+static inline void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
+        // set state of current coroutine to inactive
+        src->state = src->state == Halted ? Halted : Inactive;
+
+        // set new coroutine that task is executing
+        TL_GET( this_thread )->curr_cor = dst;
+
+        // context switch to specified coroutine
+        verify( dst->context.SP );
+        CtxSwitch( &src->context, &dst->context );
+        // when CtxSwitch 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);
+        }
+}
+
+extern void __stack_prepare   ( __stack_info_t * this, size_t size /* ignored if storage already allocated */);
 
 // Suspend implementation inlined for performance
-static inline void suspend() {
+static inline void suspend(void) {
         // optimization : read TLS once and reuse it
         // Safety note: this is preemption safe since if
@@ -77 +101 @@
         // will also migrate which means this value will
         // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_coroutine );
+        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
 
         assertf( src->last != 0,
@@ -93 +117 @@
 // Resume implementation inlined for performance
 forall(dtype T | is_coroutine(T))
-static inline void resume(T & cor) {
+static inline T & resume(T & cor) {
         // optimization : read TLS once and reuse it
         // Safety note: this is preemption safe since if
@@ -99 +123 @@
         // will also migrate which means this value will
         // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_coroutine );
+        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
         coroutine_desc * dst = get_coroutine(cor);
 
-        if( unlikely(!dst->stack.base) ) {
-                create_stack(&dst->stack, dst->stack.size);
+        if( unlikely(dst->context.SP == NULL) ) {
+                __stack_prepare(&dst->stack, 65000);
                 CtxStart(&cor, CtxInvokeCoroutine);
         }
@@ -121 +145 @@
         // always done for performance testing
         CoroutineCtxSwitch( src, dst );
+
+        return cor;
 }
 
@@ -129 +155 @@
         // will also migrate which means this value will
         // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_coroutine );
+        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
 
         // not resuming self ?