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

Timestamp:

Mar 15, 2017, 9:43:15 PM (9 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:

27fed7f1, 738e304

Parents:

bf4ac09 (diff), 9b443c7f (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.

git-author:

Peter A. Buhr <pabuhr@…> (03/15/17 21:25:49)

git-committer:

Peter A. Buhr <pabuhr@…> (03/15/17 21:43:15)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/thread.c (moved) (moved from src/libcfa/concurrency/threads.c ) (9 diffs)

src/libcfa/concurrency/thread.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads.c --
+// thread.c --
 //
 // Author           : Thierry Delisle
@@ -15 +15 @@
 //
 
-#include "threads"
+#include "thread"
 
 #include "kernel_private.h"
@@ -28 +28 @@
 }
 
-extern processor * get_this_processor();
+extern thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------
@@ -41 +41 @@
 // Thread ctors and dtors
 
-void ?{}(thread* this) {
+void ?{}(thread_desc* this) {
         (&this->c){};
         this->c.name = "Anonymous Coroutine";
@@ -48 +48 @@
 }
 
-void ^?{}(thread* this) {
+void ^?{}(thread_desc* this) {
         ^(&this->c){};
 }
@@ -74 +74 @@
 forall( dtype T | is_thread(T) )
 void start( T* this ) {
-        coroutine* thrd_c = get_coroutine(this);
-        thread*  thrd_h = get_thread   (this);
+        coroutine_desc* thrd_c = get_coroutine(this);
+        thread_desc*  thrd_h = get_thread   (this);
         thrd_c->last = this_coroutine();
-        get_this_processor()->current_coroutine = thrd_c;
+        this_processor->current_coroutine = thrd_c;
 
         LIB_DEBUG_PRINTF("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
@@ -94 +94 @@
 
 void yield( void ) {
-        ScheduleInternal( get_this_processor()->current_thread );
+        ScheduleInternal( this_processor->current_thread );
 }
 
-void ThreadCtxSwitch(coroutine* src, coroutine* dst) {
+void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // set state of current coroutine to inactive
         src->state = Inactive;
@@ -107 +107 @@
         // set new coroutine that the processor is executing
         // and context switch to it
-        get_this_processor()->current_coroutine = dst;  
+        this_processor->current_coroutine = dst;
         CtxSwitch( src->stack.context, dst->stack.context );
-        get_this_processor()->current_coroutine = src;  
+        this_processor->current_coroutine = src;
 
         // set state of new coroutine to active
@@ -116 +116 @@
 }
 
-// C Helper to signal the termination of a thread
+// C Helper to signal the termination of a thread_desc
 // Used in invoke.c
 extern "C" {
-        void __thread_signal_termination( thread * this ) {
+        void __thread_signal_termination( thread_desc * this ) {
                 this->c.state = Halted;
                 LIB_DEBUG_PRINTF("Thread end : %p\n", this);