Changeset 16a6a617 for libcfa/src/concurrency/thread.cfa

Timestamp:

Apr 2, 2019, 3:26:38 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

98319ad

Parents:

9be2b60 (diff), 2fabdc02 (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/thread.cfa (modified) (4 diffs)

libcfa/src/concurrency/thread.cfa

@@ -75 +75 @@
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc   * thrd_h = get_thread   (this);
-        thrd_c->last = TL_GET( this_coroutine );
+        thrd_c->last = TL_GET( this_thread )->curr_cor;
 
         // __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);
-        kernelTLS.this_coroutine = thrd_c;
         CtxStart(&this, CtxInvokeThread);
         assert( thrd_c->last->stack.context );
@@ -92 +91 @@
 extern "C" {
         // KERNEL ONLY
-        void __finish_creation(void) {
-                coroutine_desc* thrd_c = kernelTLS.this_coroutine;
+        void __finish_creation(coroutine_desc * thrd_c) {
                 ThreadCtxSwitch( thrd_c, thrd_c->last );
         }
@@ -120 +118 @@
         // set new coroutine that the processor is executing
         // and context switch to it
-        kernelTLS.this_coroutine = dst;
         assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
-        kernelTLS.this_coroutine = src;
 
         // set state of new coroutine to active