Changeset b4d65c7 for src/libcfa/concurrency/coroutines

Timestamp:

Feb 6, 2017, 4:19:53 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

424931d, fe26fbf

Parents:

c0aa336 (diff), 6a5f0e7 (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' of plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/coroutines (modified) (4 diffs)

src/libcfa/concurrency/coroutines

@@ -30 +30 @@
 };
 
-#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this);
+#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
 
 //-----------------------------------------------------------------------------
@@ -65 +65 @@
 
 // Private wrappers for context switch and stack creation
-extern void corCxtSw(coroutine * src, coroutine * dst);
+extern void CoroutineCtxSwitch(coroutine * src, coroutine * dst);
 extern void create_stack( coStack_t * this, unsigned int storageSize );
 
@@ -81 +81 @@
                 src->name, src, src->last->name, src->last );
 
-        corCxtSw( src, src->last );
+        CoroutineCtxSwitch( src, src->last );
 }
 
@@ -107 +107 @@
 
       // always done for performance testing
-        corCxtSw( src, dst );
+        CoroutineCtxSwitch( src, dst );
+}
+
+static inline void resume(coroutine * dst) {
+        coroutine * src = this_coroutine();             // optimization
+
+      // not resuming self ?
+        if ( src != dst ) {
+                assertf( dst->notHalted ,
+                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
+                        "Possible cause is terminated coroutine's main routine has already returned.",
+                        src->name, src, dst->name, dst );
+
+            // set last resumer
+                dst->last = src;
+        } // if
+
+      // always done for performance testing
+        CoroutineCtxSwitch( src, dst );
 }