Changeset 933f32f for libcfa/src/concurrency/thread.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

• libcfa/src/concurrency/thread.cfa (modified) (4 diffs)

libcfa/src/concurrency/thread.cfa

@@ -31 +31 @@
 // Thread ctors and dtors
 void ?{}(thread_desc & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
+        context{ NULL, NULL };
         self_cor{ name, storage, storageSize };
-        verify(&self_cor);
+        state = Start;
         curr_cor = &self_cor;
         self_mon.owner = &this;
@@ -73 +74 @@
 forall( dtype T | is_thread(T) )
 void __thrd_start( T& this ) {
-        coroutine_desc* thrd_c = get_coroutine(this);
-        thread_desc   * thrd_h = get_thread   (this);
-        thrd_c->last = TL_GET( this_coroutine );
-
-        // __cfaabi_dbg_print_safe("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
+        thread_desc * this_thrd = get_thread(this);
+        thread_desc * curr_thrd = TL_GET( this_thread );
 
         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 );
-        CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
+        this_thrd->context.[SP, FP] = this_thrd->self_cor.context.[SP, FP];
+        verify( this_thrd->context.SP );
+        CtxSwitch( &curr_thrd->context, &this_thrd->context );
 
-        ScheduleThread(thrd_h);
+        ScheduleThread(this_thrd);
         enable_interrupts( __cfaabi_dbg_ctx );
 }
@@ -92 +89 @@
 extern "C" {
         // KERNEL ONLY
-        void __finish_creation(void) {
-                coroutine_desc* thrd_c = kernelTLS.this_coroutine;
-                ThreadCtxSwitch( thrd_c, thrd_c->last );
+        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 );
         }
 }
@@ -112 +112 @@
 }
 
-// KERNEL ONLY
-void ThreadCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-        // set state of current coroutine to inactive
-        src->state = src->state == Halted ? Halted : Inactive;
-        dst->state = Active;
-
-        // 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
-        dst->state = dst->state == Halted ? Halted : Inactive;
-        src->state = Active;
-}
-
 // Local Variables: //
 // mode: c //