Changes in / [5f95b5f:6bfe5cc]

Location:

src

Files:

• libcfa/concurrency/invoke.h (modified) (1 diff)
• libcfa/concurrency/kernel.c (modified) (11 diffs)
• libcfa/concurrency/thread.c (modified) (2 diffs)
• tests/concurrent/.expect/coroutineYield.txt (deleted)
• tests/concurrent/coroutineYield.c (deleted)

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 };
 }
 
@@ -237 +225 @@
 // 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 = dst->curr_cor;
+        coroutine_desc * thrd_cor = get_coroutine(dst);
 
         //Reset the terminating actions here
@@ -250 +237 @@
         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);
 }
 
@@ -379 +360 @@
         disable_interrupts();
         verify( !preemption_enabled );
-        returnToKernel();
+        suspend();
         verify( !preemption_enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
@@ -390 +371 @@
 
         verify( !preemption_enabled );
-        returnToKernel();
+        suspend();
         verify( !preemption_enabled );
 
@@ -402 +383 @@
 
         verify( !preemption_enabled );
-        returnToKernel();
+        suspend();
         verify( !preemption_enabled );
 
@@ -416 +397 @@
 
         verify( !preemption_enabled );
-        returnToKernel();
+        suspend();
         verify( !preemption_enabled );
 
@@ -429 +410 @@
 
         verify( !preemption_enabled );
-        returnToKernel();
+        suspend();
         verify( !preemption_enabled );
 
@@ -444 +425 @@
 
         verify( !preemption_enabled );
-        returnToKernel();
+        suspend();
         verify( !preemption_enabled );
 
@@ -456 +437 @@
         this_processor->finish.thrd        = thrd;
 
-        returnToKernel();
+        suspend();
 }
 
@@ -521 +502 @@
         // which is currently here
         mainProcessor->do_terminate = true;
-        returnToKernel();
+        suspend();
 
         // 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;
@@ -105 +104 @@
         dst->state = Active;
 
+        //update the last resumer
+        dst->last = src;
+
         // set new coroutine that the processor is executing
         // and context switch to it