Changeset 58d64a4

Timestamp:

Sep 24, 2020, 4:22:05 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d8b17e2

Parents:

433d352

Message:

processor_id_t now have a bool to state if it is a full processor.
kernelTLS.this_thread now has much tighter lifetime.
Remove warning in kernel.cfa

Location:

libcfa/src/concurrency

Files:

• io/setup.cfa (modified) (1 diff)
• kernel.cfa (modified) (6 diffs)
• kernel.hfa (modified) (1 diff)
• kernel/startup.cfa (modified) (1 diff)
• preemption.cfa (modified) (1 diff)

libcfa/src/concurrency/io/setup.cfa

@@ -147 +147 @@
         static void * iopoll_loop( __attribute__((unused)) void * args ) {
                 __processor_id_t id;
+                id.full_proc = false;
                 id.id = doregister(&id);
                 __cfaabi_dbg_print_safe( "Kernel : IO poller thread starting\n" );

libcfa/src/concurrency/kernel.cfa

@@ -237 +237 @@
         $coroutine * proc_cor = get_coroutine(this->runner);
 
-        // Update global state
-        kernelTLS.this_thread = thrd_dst;
-
         // set state of processor coroutine to inactive
         verify(proc_cor->state == Active);
@@ -253 +250 @@
                         thrd_dst->unpark_stale = true;
                 )
+                // Update global state
+                kernelTLS.this_thread = thrd_dst;
 
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -259 +258 @@
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst ); // add escape condition if we are setting up the processor
 
+
                 // set context switch to the thread that the processor is executing
                 verify( thrd_dst->context.SP );
@@ -269 +269 @@
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 
+                // Reset global state
+                kernelTLS.this_thread = 0p;
 
                 // We just finished running a thread, there are a few things that could have happened.
@@ -313 +315 @@
         // Just before returning to the processor, set the processor coroutine to active
         proc_cor->state = Active;
-        kernelTLS.this_thread = 0p;
 
         /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -521 +522 @@
         disable_interrupts();
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
-                bool ret = post( this->idle );
+                post( this->idle );
         enable_interrupts( __cfaabi_dbg_ctx );
 }

libcfa/src/concurrency/kernel.hfa

@@ -48 +48 @@
 // Processor id, required for scheduling threads
 struct __processor_id_t {
-        unsigned id;
+        unsigned id:24;
+        bool full_proc:1;
 
         #if !defined(__CFA_NO_STATISTICS__)

libcfa/src/concurrency/kernel/startup.cfa

@@ -471 +471 @@
         this.cltr = &_cltr;
         id = -1u;
+        full_proc = true;
         destroyer = 0p;
         do_terminate = false;

libcfa/src/concurrency/preemption.cfa

@@ -411 +411 @@
 static void * alarm_loop( __attribute__((unused)) void * args ) {
         __processor_id_t id;
+        id.full_proc = false;
         id.id = doregister(&id);