Changeset b067d9b for libcfa/src/concurrency/kernel_private.hfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel_private.hfa (moved) (moved from src/libcfa/concurrency/kernel_private.h ) (7 diffs)

libcfa/src/concurrency/kernel_private.hfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// kernel_private.h --
+// kernel_private.hfa --
 //
 // Author           : Thierry Delisle
@@ -16 +16 @@
 #pragma once
 
-#include "kernel"
-#include "thread"
+#include "kernel.hfa"
+#include "thread.hfa"
 
-#include "alarm.h"
+#include "alarm.hfa"
 
 
@@ -26 +26 @@
 
 extern "C" {
-        void disable_interrupts();
+        void disable_interrupts() OPTIONAL_THREAD;
         void enable_interrupts_noPoll();
         void enable_interrupts( __cfaabi_dbg_ctx_param );
@@ -34 +34 @@
 static inline void WakeThread( thread_desc * thrd ) {
         if( !thrd ) return;
+
+        verify(thrd->state == Inactive);
 
         disable_interrupts();
@@ -54 +56 @@
 // Processor
 void main(processorCtx_t *);
-void start(processor * this);
-void runThread(processor * this, thread_desc * dst);
-void finishRunning(processor * this);
-void halt(processor * this);
-void wake(processor * this);
-void terminate(processor * this);
-void spin(processor * this, unsigned int * spin_count);
+
+static inline void wake_fast(processor * this) {
+        __cfaabi_dbg_print_safe("Kernel : Waking up processor %p\n", this);
+        post( this->idleLock );
+}
+
+static inline void wake(processor * this) {
+        disable_interrupts();
+        wake_fast(this);
+        enable_interrupts( __cfaabi_dbg_ctx );
+}
 
 struct event_kernel_t {
@@ -69 +75 @@
 extern event_kernel_t * event_kernel;
 
-//extern thread_local coroutine_desc * volatile this_coroutine;
-//extern thread_local thread_desc *    volatile this_thread;
-//extern thread_local processor *      volatile this_processor;
-
-// extern volatile thread_local bool preemption_in_progress;
-// extern volatile thread_local bool preemption_enabled;
-// extern volatile thread_local unsigned short disable_preempt_count;
-
 struct __cfa_kernel_preemption_state_t {
         bool enabled;
@@ -83 +81 @@
 };
 
-extern volatile thread_local __cfa_kernel_preemption_state_t preemption_state;
+extern volatile thread_local __cfa_kernel_preemption_state_t preemption_state __attribute__ ((tls_model ( "initial-exec" )));
 
 //-----------------------------------------------------------------------------