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

Timestamp:

May 18, 2018, 2:09:21 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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

@@ -30 +30 @@
 //-----------------------------------------------------------------------------
 // Thread ctors and dtors
-
-void ?{}(thread_desc& this) with( this ) {
-        self_cor{};
-        self_cor.name = "Anonymous Coroutine";
+void ?{}(thread_desc & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
+        self_cor{ name, storage, storageSize };
+        verify(&self_cor);
         curr_cor = &self_cor;
         self_mon.owner = &this;
         self_mon.recursion = 1;
         self_mon_p = &self_mon;
+        curr_cluster = &cl;
         next = NULL;
-        __cfaabi_dbg_debug_do(
-                dbg_next = NULL;
-                dbg_prev = NULL;
-                __cfaabi_dbg_thread_register(&this);
-        )
+
+        node.next = NULL;
+        node.prev = NULL;
+        doregister(this);
 
         monitors{ &self_mon_p, 1, (fptr_t)0 };
@@ -49 +48 @@
 
 void ^?{}(thread_desc& this) with( this ) {
+        unregister(this);
         ^self_cor{};
 }
@@ -81 +81 @@
         disable_interrupts();
         create_stack(&thrd_c->stack, thrd_c->stack.size);
-        TL_SET( this_coroutine, thrd_c );
+        kernelTLS.this_coroutine = thrd_c;
         CtxStart(&this, CtxInvokeThread);
         assert( thrd_c->last->stack.context );
@@ -91 +91 @@
 
 extern "C" {
+        // KERNEL ONLY
         void __finish_creation(void) {
-                coroutine_desc* thrd_c = TL_GET( this_coroutine );
+                coroutine_desc* thrd_c = kernelTLS.this_coroutine;
                 ThreadCtxSwitch( thrd_c, thrd_c->last );
         }
@@ -98 +99 @@
 
 void yield( void ) {
-        verify( TL_GET( preemption_state ).enabled );
+        // Safety note : This could cause some false positives due to preemption
+      verify( TL_GET( preemption_state.enabled ) );
         BlockInternal( TL_GET( this_thread ) );
-        verify( TL_GET( preemption_state ).enabled );
+        // Safety note : This could cause some false positives due to preemption
+      verify( TL_GET( preemption_state.enabled ) );
 }
 
@@ -109 +112 @@
 }
 
+// KERNEL ONLY
 void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // set state of current coroutine to inactive
@@ -116 +120 @@
         // set new coroutine that the processor is executing
         // and context switch to it
-        TL_SET( this_coroutine, dst );
+        kernelTLS.this_coroutine = dst;
         assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
-        TL_SET( this_coroutine, src );
+        kernelTLS.this_coroutine = src;
 
         // set state of new coroutine to active