Changes in src/libcfa/concurrency/kernel_private.h [2ac095d:4aa2fb2]

File:

• src/libcfa/concurrency/kernel_private.h (modified) (3 diffs)

src/libcfa/concurrency/kernel_private.h

@@ -18 +18 @@
 #define KERNEL_PRIVATE_H
 
-#include "libhdr.h"
-
 #include "kernel"
 #include "thread"
@@ -25 +23 @@
 #include "alarm.h"
 
+#include "libhdr.h"
 
 //-----------------------------------------------------------------------------
 // Scheduler
-
-extern "C" {
-        void disable_interrupts();
-        void enable_interrupts_noRF();
-        void enable_interrupts( DEBUG_CTX_PARAM );
-}
-
 void ScheduleThread( thread_desc * );
-static inline void WakeThread( thread_desc * thrd ) {
-        if( !thrd ) return;
-
-        disable_interrupts();
-        ScheduleThread( thrd );
-        enable_interrupts( DEBUG_CTX );
-}
 thread_desc * nextThread(cluster * this);
 
-void BlockInternal(void);
-void BlockInternal(spinlock * lock);
-void BlockInternal(thread_desc * thrd);
-void BlockInternal(spinlock * lock, thread_desc * thrd);
-void BlockInternal(spinlock ** locks, unsigned short count);
-void BlockInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
+void ScheduleInternal(void);
+void ScheduleInternal(spinlock * lock);
+void ScheduleInternal(thread_desc * thrd);
+void ScheduleInternal(spinlock * lock, thread_desc * thrd);
+void ScheduleInternal(spinlock ** locks, unsigned short count);
+void ScheduleInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
 
 //-----------------------------------------------------------------------------
@@ -75 +60 @@
 extern cluster * systemCluster;
 extern system_proc_t * systemProcessor;
-extern volatile thread_local processor * this_processor;
-extern volatile thread_local coroutine_desc * this_coroutine;
-extern volatile thread_local thread_desc * this_thread;
-extern volatile thread_local unsigned short disable_preempt_count;
+extern thread_local processor * this_processor;
+
+static inline void disable_interrupts() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, 1, __ATOMIC_SEQ_CST );
+        assert( prev != (unsigned short) -1 );
+}
+
+static inline void enable_interrupts_noRF() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+        verify( prev != (unsigned short) 0 );
+}
+
+static inline void enable_interrupts() {
+        __attribute__((unused)) unsigned short prev = __atomic_fetch_add_2( &this_processor->disable_preempt_count, -1, __ATOMIC_SEQ_CST );
+        verify( prev != (unsigned short) 0 );
+        if( prev == 1 && this_processor->pending_preemption ) {
+                ScheduleInternal( this_processor->current_thread );
+                this_processor->pending_preemption = false;
+        }
+}
 
 //-----------------------------------------------------------------------------