Changeset b1e63ac5 for src/libcfa/concurrency/kernel_private.h

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

File:

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

src/libcfa/concurrency/kernel_private.h

@@ -21 +21 @@
 #include "thread"
 
+#include "alarm.h"
+
+#include "libhdr.h"
+
 //-----------------------------------------------------------------------------
 // Scheduler
@@ -35 +39 @@
 //-----------------------------------------------------------------------------
 // Processor
-struct processorCtx_t {
+coroutine processorCtx_t {
         processor * proc;
-        coroutine_desc __cor;
 };
-
-DECL_COROUTINE(processorCtx_t);
 
 void main(processorCtx_t *);
@@ -47 +48 @@
 void finishRunning(processor * this);
 void spin(processor * this, unsigned int * spin_count);
+
+struct system_proc_t {
+        processor proc;
+
+        alarm_list_t alarms;
+        spinlock alarm_lock;
+
+        bool pending_alarm;
+};
+
+extern cluster * systemCluster;
+extern system_proc_t * systemProcessor;
+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;
+        }
+}
 
 //-----------------------------------------------------------------------------