Changeset 82c948c for src/libcfa

Timestamp:

Feb 6, 2018, 10:07:18 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

7323573

Parents:

0188a0b

Message:

Thread context switch no longer break coroutines.
Added corresponding test

Location:

src/libcfa/concurrency

Files:

• invoke.h (modified) (1 diff)
• kernel.c (modified) (11 diffs)
• thread.c (modified) (2 diffs)

src/libcfa/concurrency/invoke.h

@@ -121 +121 @@
                 // coroutine body used to store context
                 struct coroutine_desc  self_cor;
+
+                // current active context
+                struct coroutine_desc * curr_cor;
 
                 // monitor body used for mutual exclusion

src/libcfa/concurrency/kernel.c

@@ -108 +108 @@
 void ?{}( thread_desc & this, current_stack_info_t * info) with( this ) {
         self_cor{ info };
+        curr_cor = &self_cor;
+        self_mon.owner = &this;
+        self_mon.recursion = 1;
+        self_mon_p = &self_mon;
+        next = NULL;
+        __cfaabi_dbg_debug_do(
+                dbg_next = NULL;
+                dbg_prev = NULL;
+                __cfaabi_dbg_thread_register(&this);
+        )
+
+        monitors{ &self_mon_p, 1, (fptr_t)0 };
 }
 
@@ -225 +237 @@
 // from the processor coroutine to the target thread
 void runThread(processor * this, thread_desc * dst) {
+        assert(dst->curr_cor);
         coroutine_desc * proc_cor = get_coroutine(*this->runner);
-        coroutine_desc * thrd_cor = get_coroutine(dst);
+        coroutine_desc * thrd_cor = dst->curr_cor;
 
         //Reset the terminating actions here
@@ -237 +250 @@
         ThreadCtxSwitch(proc_cor, thrd_cor);
         // when ThreadCtxSwitch returns we are back in the processor coroutine
+}
+
+void returnToKernel() {
+        coroutine_desc * proc_cor = get_coroutine(*this_processor->runner);
+        coroutine_desc * thrd_cor = this_thread->curr_cor = this_coroutine;
+        ThreadCtxSwitch(thrd_cor, proc_cor);
 }
 
@@ -360 +379 @@
         disable_interrupts();
         verify( !preemption_enabled );
-        suspend();
+        returnToKernel();
         verify( !preemption_enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
@@ -371 +390 @@
 
         verify( !preemption_enabled );
-        suspend();
+        returnToKernel();
         verify( !preemption_enabled );
 
@@ -383 +402 @@
 
         verify( !preemption_enabled );
-        suspend();
+        returnToKernel();
         verify( !preemption_enabled );
 
@@ -397 +416 @@
 
         verify( !preemption_enabled );
-        suspend();
+        returnToKernel();
         verify( !preemption_enabled );
 
@@ -410 +429 @@
 
         verify( !preemption_enabled );
-        suspend();
+        returnToKernel();
         verify( !preemption_enabled );
 
@@ -425 +444 @@
 
         verify( !preemption_enabled );
-        suspend();
+        returnToKernel();
         verify( !preemption_enabled );
 
@@ -437 +456 @@
         this_processor->finish.thrd        = thrd;
 
-        suspend();
+        returnToKernel();
 }
 
@@ -502 +521 @@
         // which is currently here
         mainProcessor->do_terminate = true;
-        suspend();
+        returnToKernel();
 
         // THE SYSTEM IS NOW COMPLETELY STOPPED

src/libcfa/concurrency/thread.c

@@ -34 +34 @@
         self_cor{};
         self_cor.name = "Anonymous Coroutine";
+        curr_cor = &self_cor;
         self_mon.owner = &this;
         self_mon.recursion = 1;
@@ -104 +105 @@
         dst->state = Active;
 
-        //update the last resumer
-        dst->last = src;
-
         // set new coroutine that the processor is executing
         // and context switch to it