Changeset bae0d35 for libcfa/src/concurrency/coroutine.hfa

Timestamp:

Jun 7, 2021, 2:09:12 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5a46e09

Parents:

82f4063 (diff), 53692b3 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/coroutine.hfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.hfa

@@ -86 +86 @@
         src->state = src->state == Halted ? Halted : Blocked;
 
+        // get the active thread once
+        $thread * athrd = active_thread();
+
+        // Mark the coroutine
+        /* paranoid */ verify( !athrd->corctx_flag );
+        athrd->corctx_flag = true;
+
         // set new coroutine that task is executing
-        active_thread()->curr_cor = dst;
+        athrd->curr_cor = dst;
 
         // context switch to specified coroutine
-        verify( dst->context.SP );
+        /* paranoid */ verify( dst->context.SP );
         __cfactx_switch( &src->context, &dst->context );
         // when __cfactx_switch returns we are back in the src coroutine
+
+        /* paranoid */ verify( athrd->corctx_flag );
+        athrd->corctx_flag = false;
 
         // set state of new coroutine to active