Changes in libcfa/src/concurrency/coroutine.hfa [73abe95:212c2187]

File:

• libcfa/src/concurrency/coroutine.hfa (modified) (6 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))
@@ -71 +71 @@
 
 // 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 +77 @@
         // 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,
@@ -99 +99 @@
         // 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);
 
@@ -129 +129 @@
         // 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 ?
@@ -146 +146 @@
 }
 
+
+
+// static inline bool suspend_checkpoint(void) {
+//      // optimization : read TLS once and reuse it
+//      // Safety note: this is preemption safe since if
+//      // preemption occurs after this line, the pointer
+//      // will also migrate which means this value will
+//      // stay in syn with the TLS
+//      // set state of current coroutine to inactive
+//       this->state = Checkpoint;
+
+//       // context switch to specified coroutine
+//       assert( src->stack.context );
+
+//       CtxStore(src->stack.context);
+
+//      bool ret = this->state == Checkpoint;
+
+//       // set state of new coroutine to active
+//       src->state = Active;
+
+//       enable_interrupts( __cfaabi_dbg_ctx );
+//       // Safety note : This could cause some false positives due to preemption
+//       verify( TL_GET( preemption_state.enabled ) || TL_GET( this_processor )->do_terminate );
+
+//       if( unlikely(src->cancellation != NULL) ) {
+//             _CtxCoroutine_Unwind(src->cancellation);
+//       }
+
+//      return ret;
+// }
+
+// static inline void suspend_return(void) {
+//      // optimization : read TLS once and reuse it
+//      // Safety note: this is preemption safe since if
+//      // preemption occurs after this line, the pointer
+//      // will also migrate which means this value will
+//      // stay in syn with the TLS
+//      coroutine_desc * src = TL_GET( this_thread )->curr_cor;
+
+//      assertf( src->last != 0,
+//              "Attempt to suspend coroutine \"%.256s\" (%p) that has never been resumed.\n"
+//              "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
+//              src->name, src );
+//      assertf( src->last->state != Halted,
+//              "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
+//              "Possible cause is terminated coroutine's main routine has already returned.",
+//              src->name, src, src->last->name, src->last );
+
+//      // Safety note : Preemption must be disabled here since kernelTLS.this_coroutine must always be up to date
+//       verify( TL_GET( preemption_state.enabled ) || TL_GET( this_processor )->do_terminate );
+//       disable_interrupts();
+
+//       // set state of current coroutine to inactive
+//       src->state = src->state == Halted ? Halted : Inactive;
+
+//       // set new coroutine that task is executing
+//       kernelTLS.this_coroutine = dst;
+
+//       // context switch to specified coroutine
+//       assert( src->stack.context );
+//      CtxRet( src->stack.context );
+
+//      abort();
+// }
+
 // Local Variables: //
 // mode: c //