Changes in libcfa/src/concurrency/coroutine.hfa [10248ae0:73abe95]

File:

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

libcfa/src/concurrency/coroutine.hfa

@@ -46 +46 @@
 //-----------------------------------------------------------------------------
 // Public coroutine API
-static inline void suspend(void);
+static inline void suspend();
 
 forall(dtype T | is_coroutine(T))
-static inline T & resume(T & cor);
+static inline void 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
-// 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 */);
+extern void CoroutineCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
+extern void create_stack( coStack_t * this, unsigned int storageSize );
 
 // Suspend implementation inlined for performance
-static inline void suspend(void) {
+static inline void suspend() {
         // optimization : read TLS once and reuse it
         // Safety note: this is preemption safe since if
@@ -101 +77 @@
         // 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 * src = TL_GET( this_coroutine );
 
         assertf( src->last != 0,
@@ -117 +93 @@
 // Resume implementation inlined for performance
 forall(dtype T | is_coroutine(T))
-static inline T & resume(T & cor) {
+static inline void resume(T & cor) {
         // optimization : read TLS once and reuse it
         // Safety note: this is preemption safe since if
@@ -123 +99 @@
         // 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 * src = TL_GET( this_coroutine );
         coroutine_desc * dst = get_coroutine(cor);
 
-        if( unlikely(dst->context.SP == NULL) ) {
-                __stack_prepare(&dst->stack, 65000);
+        if( unlikely(!dst->stack.base) ) {
+                create_stack(&dst->stack, dst->stack.size);
                 CtxStart(&cor, CtxInvokeCoroutine);
         }
@@ -145 +121 @@
         // always done for performance testing
         CoroutineCtxSwitch( src, dst );
-
-        return cor;
 }
 
@@ -155 +129 @@
         // 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 * src = TL_GET( this_coroutine );
 
         // not resuming self ?