Changeset 1cdfa82 for src/libcfa/concurrency/coroutine.c

Timestamp:

Apr 25, 2018, 4:55:53 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

• src/libcfa/concurrency/coroutine.c (modified) (5 diffs)

src/libcfa/concurrency/coroutine.c

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  8 16:10:31 2018
-// Update Count     : 4
+// Last Modified On : Fri Mar 30 17:20:57 2018
+// Update Count     : 9
 //
 
@@ -99 +99 @@
 // Wrapper for co
 void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-        verify( preemption_state.enabled || this_processor->do_terminate );
+        verify( TL_GET( preemption_state ).enabled || TL_GET( this_processor )->do_terminate );
         disable_interrupts();
 
@@ -106 +106 @@
 
         // set new coroutine that task is executing
-        this_coroutine = dst;
+        TL_SET( this_coroutine, dst );
 
         // context switch to specified coroutine
@@ -117 +117 @@
 
         enable_interrupts( __cfaabi_dbg_ctx );
-        verify( preemption_state.enabled || this_processor->do_terminate );
+        verify( TL_GET( preemption_state ).enabled || TL_GET( this_processor )->do_terminate );
 } //ctxSwitchDirect
 
@@ -172 +172 @@
 
         void __leave_coroutine(void) {
-                coroutine_desc * src = this_coroutine;          // optimization
+                coroutine_desc * src = TL_GET( this_coroutine ); // optimization
 
                 assertf( src->starter != 0,