Changes in libcfa/src/concurrency/kernel/startup.cfa [7d0ebd0:eaf269d]

File:

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

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 );