Changeset 1cdfa82 for src/libcfa/concurrency/thread.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/thread.c (modified) (7 diffs)

src/libcfa/concurrency/thread.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:34:46 2017
-// Update Count     : 1
+// Last Modified On : Fri Mar 30 17:19:52 2018
+// Update Count     : 8
 //
 
@@ -26 +26 @@
 }
 
-extern volatile thread_local processor * this_processor;
+//extern volatile thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------
@@ -75 +75 @@
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc   * thrd_h = get_thread   (this);
-        thrd_c->last = this_coroutine;
+        thrd_c->last = TL_GET( this_coroutine );
 
         // __cfaabi_dbg_print_safe("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
@@ -81 +81 @@
         disable_interrupts();
         create_stack(&thrd_c->stack, thrd_c->stack.size);
-        this_coroutine = thrd_c;
+        TL_SET( this_coroutine, thrd_c );
         CtxStart(&this, CtxInvokeThread);
         assert( thrd_c->last->stack.context );
@@ -92 +92 @@
 extern "C" {
         void __finish_creation(void) {
-                coroutine_desc* thrd_c = this_coroutine;
+                coroutine_desc* thrd_c = TL_GET( this_coroutine );
                 ThreadCtxSwitch( thrd_c, thrd_c->last );
         }
@@ -98 +98 @@
 
 void yield( void ) {
-        verify( preemption_state.enabled );
-        BlockInternal( this_thread );
-        verify( preemption_state.enabled );
+        verify( TL_GET( preemption_state ).enabled );
+        BlockInternal( TL_GET( this_thread ) );
+        verify( TL_GET( preemption_state ).enabled );
 }
 
@@ -116 +116 @@
         // set new coroutine that the processor is executing
         // and context switch to it
-        this_coroutine = dst;
+        TL_SET( this_coroutine, dst );
         assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
-        this_coroutine = src;
+        TL_SET( this_coroutine, src );
 
         // set state of new coroutine to active