Changes in libcfa/src/concurrency/kernel.cfa [ae7adbc4:d3605f8]

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -142 +142 @@
 extern void __disable_interrupts_hard();
 extern void __enable_interrupts_hard();
+
+static inline void __disable_interrupts_checked() {
+        /* paranoid */ verify( __preemption_enabled() );
+        disable_interrupts();
+        /* paranoid */ verify( ! __preemption_enabled() );
+}
+
+static inline void __enable_interrupts_checked( bool poll = true ) {
+        /* paranoid */ verify( ! __preemption_enabled() );
+        enable_interrupts( poll );
+        /* paranoid */ verify( __preemption_enabled() );
+}
 
 
@@ -737 +749 @@
 
         // Check if there is a sleeping processor
-        // int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
-        int fd = 0;
-        if( __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST) != 0 ) {
-                fd = __atomic_exchange_n(&this->procs.fd, 0, __ATOMIC_RELAXED);
-        }
+        int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
 
         // If no one is sleeping, we are done
@@ -768 +776 @@
 // Unconditionnaly wake a thread
 void __wake_proc(processor * this) {
-        /* paranoid */ verify( ! __preemption_enabled() );
-
         __cfadbg_print_safe(runtime_core, "Kernel : waking Processor %p\n", this);
 
-        eventfd_t val;
-        val = 1;
-        eventfd_write( this->idle_fd, val );
-
-        /* paranoid */ verify( ! __preemption_enabled() );
+        __disable_interrupts_checked();
+                /* paranoid */ verify( ! __preemption_enabled() );
+                eventfd_t val;
+                val = 1;
+                eventfd_write( this->idle_fd, val );
+        __enable_interrupts_checked();
 }