Changeset ef6851a for src/libcfa/concurrency/thread.c

Timestamp:

Jul 12, 2017, 9:50:58 PM (7 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:

1a6e855

Parents:

8b47e50 (diff), acb89ed (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/thread.c (modified) (4 diffs)

src/libcfa/concurrency/thread.c

@@ -28 +28 @@
 }
 
-extern thread_local processor * this_processor;
+extern volatile thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------
@@ -71 +71 @@
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc*  thrd_h = get_thread   (this);
-        thrd_c->last = this_coroutine();
-        this_processor->current_coroutine = thrd_c;
+        thrd_c->last = this_coroutine;
 
-        LIB_DEBUG_PRINT_SAFE("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
+        // LIB_DEBUG_PRINT_SAFE("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
 
+        disable_interrupts();
         create_stack(&thrd_c->stack, thrd_c->stack.size);
+        this_coroutine = thrd_c;
         CtxStart(this, CtxInvokeThread);
+        assert( thrd_c->last->stack.context );
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
 
         ScheduleThread(thrd_h);
+        enable_interrupts( DEBUG_CTX );
 }
 
 void yield( void ) {
-        ScheduleInternal( this_processor->current_thread );
+        BlockInternal( (thread_desc *)this_thread );
 }
 
@@ -95 +98 @@
 void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // set state of current coroutine to inactive
-        src->state = Inactive;
+        src->state = src->state == Halted ? Halted : Inactive;
         dst->state = Active;
 
@@ -103 +106 @@
         // set new coroutine that the processor is executing
         // and context switch to it
-        this_processor->current_coroutine = dst;
+        this_coroutine = dst;
+        assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
-        this_processor->current_coroutine = src;
+        this_coroutine = src;
 
         // set state of new coroutine to active
-        dst->state = Inactive;
+        dst->state = dst->state == Halted ? Halted : Inactive;
         src->state = Active;
 }