Changes in / [cc56283:04a8a54]

Files:

• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/concurrency/kernel.cfa (modified) (2 diffs)
• libcfa/src/concurrency/kernel/startup.cfa (modified) (2 diffs)
• libcfa/src/concurrency/kernel_private.hfa (modified) (1 diff)
• tests/io/.expect/io-acquire-no-io.txt (deleted)
• tests/io/.expect/io-acquire-term-sync.txt (deleted)
• tests/io/.in/io-acquire-term-sync.txt (deleted)
• tests/io/io-acquire-no-io.cfa (deleted)
• tests/io/io-acquire-term-sync.cfa (deleted)

libcfa/src/Makefile.am

@@ -121 +121 @@
         concurrency/monitor.hfa \
         concurrency/mutex.hfa \
-        concurrency/select.hfa \
         concurrency/thread.hfa
 

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() );
+}
 
 
@@ -764 +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();
 }
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -279 +279 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
-        /* paranoid */ verify( !__atomic_load_n(&mainProcessor->do_terminate, __ATOMIC_ACQUIRE) );
         __atomic_store_n(&mainProcessor->do_terminate, true, __ATOMIC_RELEASE);
-        __wake_proc( mainProcessor );
         __kernel_last_resume( __cfaabi_tls.this_processor );
         mainThread->self_cor.state = Halted;
@@ -566 +564 @@
 extern size_t __page_size;
 void ^?{}(processor & this) with( this ){
-        /* paranoid */ verify( !__atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) );
-        __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
-
-        __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
-        __disable_interrupts_checked();
+        if( ! __atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) ) {
+                __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
+
+                __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
                 __wake_proc( &this );
-        __enable_interrupts_checked();
-
-        wait( terminated );
-        /* paranoid */ verify( active_processor() != &this);
+
+                wait( terminated );
+                /* paranoid */ verify( active_processor() != &this);
+        }
 
         __destroy_pthread( kernel_thread, this.stack, 0p );

libcfa/src/concurrency/kernel_private.hfa

@@ -60 +60 @@
 extern bool __preemption_enabled();
 
-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() );
-}
-
 //release/wake-up the following resources
 void __thread_finish( thread$ * thrd );