Changeset 212c2187 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Apr 1, 2019, 2:04:14 PM (5 years ago)

Author:

tdelisle <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:

2fabdc02

Parents:

b611fc3

Message:

Removed kernelTLS.this_coroutine which was redundant and some preleminary work for breaking into 2 step the context-switch

File:

• libcfa/src/concurrency/kernel.cfa (modified) (8 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -60 +60 @@
         NULL,
         NULL,
-        NULL,
         { 1, false, false }
 };
@@ -263 +262 @@
 static void returnToKernel() {
         coroutine_desc * proc_cor = get_coroutine(kernelTLS.this_processor->runner);
-        coroutine_desc * thrd_cor = kernelTLS.this_thread->curr_cor = kernelTLS.this_coroutine;
+        coroutine_desc * thrd_cor = kernelTLS.this_thread->curr_cor;
         ThreadCtxSwitch(thrd_cor, proc_cor);
 }
@@ -307 +306 @@
         processor * proc = (processor *) arg;
         kernelTLS.this_processor = proc;
-        kernelTLS.this_coroutine = NULL;
         kernelTLS.this_thread    = NULL;
         kernelTLS.preemption_state.[enabled, disable_count] = [false, 1];
@@ -321 +319 @@
 
         //Set global state
-        kernelTLS.this_coroutine = get_coroutine(proc->runner);
         kernelTLS.this_thread    = NULL;
 
@@ -351 +348 @@
 // KERNEL_ONLY
 void kernel_first_resume(processor * this) {
-        coroutine_desc * src = kernelTLS.this_coroutine;
+        coroutine_desc * src = mainThread->curr_cor;
         coroutine_desc * dst = get_coroutine(this->runner);
 
@@ -366 +363 @@
         // set state of current coroutine to inactive
         src->state = src->state == Halted ? Halted : Inactive;
-
-        // set new coroutine that task is executing
-        kernelTLS.this_coroutine = dst;
 
         // SKULLDUGGERY normally interrupts are enable before leaving a coroutine ctxswitch.
@@ -599 +593 @@
         kernelTLS.this_processor = mainProcessor;
         kernelTLS.this_thread    = mainThread;
-        kernelTLS.this_coroutine = &mainThread->self_cor;
 
         // Enable preemption
@@ -720 +713 @@
                 __cfaabi_dbg_bits_write( abort_text, len );
 
-                if ( get_coroutine(thrd) != kernelTLS.this_coroutine ) {
-                        len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", kernelTLS.this_coroutine->name, kernelTLS.this_coroutine );
+                if ( &thrd->self_cor != thrd->curr_cor ) {
+                        len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", thrd->curr_cor->name, thrd->curr_cor );
                         __cfaabi_dbg_bits_write( abort_text, len );
                 }