Changeset 3b56166 for libcfa/src/concurrency/thread.cfa

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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) (6 diffs)

libcfa/src/concurrency/thread.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 17:19:52 2018
-// Update Count     : 8
+// Last Modified On : Wed Dec  4 09:17:49 2019
+// Update Count     : 9
 //
 
@@ -33 +33 @@
 // Thread ctors and dtors
 void ?{}(thread_desc & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
-        context{ NULL, NULL };
+        context{ 0p, 0p };
         self_cor{ name, storage, storageSize };
         state = Start;
@@ -41 +41 @@
         self_mon_p = &self_mon;
         curr_cluster = &cl;
-        next = NULL;
+        next = 0p;
 
-        node.next = NULL;
-        node.prev = NULL;
+        node.next = 0p;
+        node.prev = 0p;
         doregister(curr_cluster, this);
 
@@ -58 +58 @@
 void ?{}( scoped(T)& this ) with( this ) {
         handle{};
-        __thrd_start(handle);
+        __thrd_start(handle, main);
 }
 
@@ -64 +64 @@
 void ?{}( scoped(T)& this, P params ) with( this ) {
         handle{ params };
-        __thrd_start(handle);
+        __thrd_start(handle, main);
 }
 
@@ -75 +75 @@
 // Starting and stopping threads
 forall( dtype T | is_thread(T) )
-void __thrd_start( T& this ) {
+void __thrd_start( T & this, void (*main_p)(T &) ) {
         thread_desc * this_thrd = get_thread(this);
         thread_desc * curr_thrd = TL_GET( this_thread );
 
         disable_interrupts();
-        CtxStart(&this, CtxInvokeThread);
+        CtxStart(main_p, get_coroutine(this), this, CtxInvokeThread);
+
         this_thrd->context.[SP, FP] = this_thrd->self_cor.context.[SP, FP];
         verify( this_thrd->context.SP );
-        CtxSwitch( &curr_thrd->context, &this_thrd->context );
+        // CtxSwitch( &curr_thrd->context, &this_thrd->context );
 
         ScheduleThread(this_thrd);
         enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-extern "C" {
-        // KERNEL ONLY
-        void __finish_creation(thread_desc * this) {
-                // set new coroutine that the processor is executing
-                // and context switch to it
-                verify( kernelTLS.this_thread != this );
-                verify( kernelTLS.this_thread->context.SP );
-                CtxSwitch( &this->context, &kernelTLS.this_thread->context );
-        }
 }