Changes in libcfa/src/concurrency/coroutine.hfa [212c2187:3c06bba]

File:

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

libcfa/src/concurrency/coroutine.hfa

@@ -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");
+        // void CtxStore ( void * this ) asm ("CtxStore");
+        // void CtxRet   ( void * dst  ) asm ("CtxRet");
 }
 
 // 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
@@ -102 +128 @@
         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);
         }