Changes in libcfa/src/concurrency/kernel.cfa [f586539:8e16177]

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -15 +15 @@
 
 #define __cforall_thread__
+// #define __CFA_DEBUG_PRINT_RUNTIME_CORE__
 
 //C Includes
@@ -40 +41 @@
 #include "invoke.h"
 
+
 //-----------------------------------------------------------------------------
 // Some assembly required
@@ -230 +232 @@
         idle{};
 
-        __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", &this);
+        __cfadbg_print_safe(runtime_core, "Kernel : Starting core %p\n", &this);
 
         this.stack = __create_pthread( &this.kernel_thread, __invoke_processor, (void *)&this );
 
-        __cfaabi_dbg_print_safe("Kernel : core %p started\n", &this);
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p created\n", &this);
 }
 
 void ^?{}(processor & this) with( this ){
         if( ! __atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) ) {
-                __cfaabi_dbg_print_safe("Kernel : core %p signaling termination\n", &this);
+                __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
 
                 __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
@@ -248 +250 @@
         }
 
-        pthread_join( kernel_thread, 0p );
+        int err = pthread_join( kernel_thread, 0p );
+        if( err != 0 ) abort("KERNEL ERROR: joining processor %p caused error %s\n", &this, strerror(err));
+
         free( this.stack );
 }
 
-void ?{}(cluster & this, const char name[], Duration preemption_rate) with( this ) {
+void ?{}(cluster & this, const char name[], Duration preemption_rate, int io_flags) with( this ) {
         this.name = name;
         this.preemption_rate = preemption_rate;
@@ -258 +262 @@
         ready_queue_lock{};
 
+        #if !defined(__CFA_NO_STATISTICS__)
+                print_stats = false;
+        #endif
+
         procs{ __get };
         idles{ __get };
         threads{ __get };
 
+        __kernel_io_startup( this, io_flags, &this == mainCluster );
+
         doregister(this);
 }
 
 void ^?{}(cluster & this) {
+        __kernel_io_shutdown( this, &this == mainCluster );
+
         unregister(this);
 }
@@ -281 +293 @@
         verify(this);
 
-        __cfaabi_dbg_print_safe("Kernel : core %p starting\n", this);
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p starting\n", this);
 
         doregister(this->cltr, this);
@@ -289 +301 @@
                 preemption_scope scope = { this };
 
-                __cfaabi_dbg_print_safe("Kernel : core %p started\n", this);
+                __cfadbg_print_safe(runtime_core, "Kernel : core %p started\n", this);
 
                 $thread * readyThread = 0p;
@@ -315 +327 @@
                 }
 
-                __cfaabi_dbg_print_safe("Kernel : core %p stopping\n", this);
+                __cfadbg_print_safe(runtime_core, "Kernel : core %p stopping\n", this);
         }
 
@@ -322 +334 @@
         V( this->terminated );
 
-        __cfaabi_dbg_print_safe("Kernel : core %p terminated\n", this);
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p terminated\n", this);
 
         // HACK : the coroutine context switch expects this_thread to be set
@@ -467 +479 @@
 
         //We now have a proper context from which to schedule threads
-        __cfaabi_dbg_print_safe("Kernel : core %p created (%p, %p)\n", proc, &proc->runner, &ctx);
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p created (%p, %p)\n", proc, &proc->runner, &ctx);
 
         // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't
@@ -478 +490 @@
 
         // Main routine of the core returned, the core is now fully terminated
-        __cfaabi_dbg_print_safe("Kernel : core %p main ended (%p)\n", proc, &proc->runner);
+        __cfadbg_print_safe(runtime_core, "Kernel : core %p main ended (%p)\n", proc, &proc->runner);
 
         return 0p;
@@ -611 +623 @@
 }
 
-void unpark( $thread * thrd __cfaabi_dbg_ctx_param2 ) {
-        if( !thrd ) return;
-
-        disable_interrupts();
+// KERNEL ONLY unpark with out disabling interrupts
+void __unpark( $thread * thrd __cfaabi_dbg_ctx_param2 ) {
         static_assert(sizeof(thrd->state) == sizeof(int));
 
@@ -643 +653 @@
                         abort();
         }
+}
+
+void unpark( $thread * thrd __cfaabi_dbg_ctx_param2 ) {
+        if( !thrd ) return;
+
+        disable_interrupts();
+        __unpark( thrd __cfaabi_dbg_ctx_fwd2 );
         enable_interrupts( __cfaabi_dbg_ctx );
 }
@@ -704 +721 @@
 static void __kernel_startup(void) {
         verify( ! kernelTLS.preemption_state.enabled );
-        __cfaabi_dbg_print_safe("Kernel : Starting\n");
+        __cfadbg_print_safe(runtime_core, "Kernel : Starting\n");
 
         __page_size = sysconf( _SC_PAGESIZE );
@@ -715 +732 @@
         (*mainCluster){"Main Cluster"};
 
-        __cfaabi_dbg_print_safe("Kernel : Main cluster ready\n");
+        __cfadbg_print_safe(runtime_core, "Kernel : Main cluster ready\n");
 
         // Start by initializing the main thread
@@ -725 +742 @@
         (*mainThread){ &info };
 
-        __cfaabi_dbg_print_safe("Kernel : Main thread ready\n");
+        __cfadbg_print_safe(runtime_core, "Kernel : Main thread ready\n");
 
 
@@ -746 +763 @@
 
                 runner{ &this };
-                __cfaabi_dbg_print_safe("Kernel : constructed main processor context %p\n", &runner);
+                __cfadbg_print_safe(runtime_core, "Kernel : constructed main processor context %p\n", &runner);
         }
 
@@ -771 +788 @@
 
 
-
         // THE SYSTEM IS NOW COMPLETELY RUNNING
-        __cfaabi_dbg_print_safe("Kernel : Started\n--------------------------------------------------\n\n");
+
+
+        // Now that the system is up, finish creating systems that need threading
+        __kernel_io_finish_start( *mainCluster );
+
+
+        __cfadbg_print_safe(runtime_core, "Kernel : Started\n--------------------------------------------------\n\n");
 
         verify( ! kernelTLS.preemption_state.enabled );
@@ -781 +803 @@
 
 static void __kernel_shutdown(void) {
-        __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n");
+        //Before we start shutting things down, wait for systems that need threading to shutdown
+        __kernel_io_prepare_stop( *mainCluster );
 
         /* paranoid */ verify( TL_GET( preemption_state.enabled ) );
         disable_interrupts();
         /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
+        __cfadbg_print_safe(runtime_core, "\n--------------------------------------------------\nKernel : Shutting down\n");
 
         // SKULLDUGGERY: Notify the mainProcessor it needs to terminates.
@@ -801 +826 @@
         // Destroy the main processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
+        void ^?{}(processor & this) with( this ){
+                /* paranoid */ verify( this.do_terminate == true );
+        }
+
         ^(*mainProcessor){};
 
@@ -808 +837 @@
         ^(*mainThread){};
 
+        ^(*mainCluster){};
+
         ^(__cfa_dbg_global_clusters.list){};
         ^(__cfa_dbg_global_clusters.lock){};
 
-        __cfaabi_dbg_print_safe("Kernel : Shutdown complete\n");
+        __cfadbg_print_safe(runtime_core, "Kernel : Shutdown complete\n");
 }
 
@@ -836 +867 @@
 
         // We are ready to sleep
-        __cfaabi_dbg_print_safe("Kernel : Processor %p ready to sleep\n", this);
+        __cfadbg_print_safe(runtime_core, "Kernel : Processor %p ready to sleep\n", this);
         wait( idle );
 
         // We have woken up
-        __cfaabi_dbg_print_safe("Kernel : Processor %p woke up and ready to run\n", this);
+        __cfadbg_print_safe(runtime_core, "Kernel : Processor %p woke up and ready to run\n", this);
 
         // Get ourself off the idle list
@@ -856 +887 @@
 static bool __wake_one(cluster * this, __attribute__((unused)) bool force) {
         // if we don't want to force check if we know it's false
-        if( !this->idles.head && !force ) return false;
+        // if( !this->idles.head && !force ) return false;
 
         // First, lock the cluster idle
@@ -869 +900 @@
 
         // Wake them up
+        __cfadbg_print_safe(runtime_core, "Kernel : waking Processor %p\n", this->idles.head);
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
         post( this->idles.head->idle );
 
@@ -878 +911 @@
 // Unconditionnaly wake a thread
 static bool __wake_proc(processor * this) {
-        return post( this->idle );
+        __cfadbg_print_safe(runtime_core, "Kernel : waking Processor %p\n", this);
+
+        disable_interrupts();
+                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+                bool ret = post( this->idle );
+        enable_interrupts( __cfaabi_dbg_ctx );
+
+        return ret;
 }
 
@@ -960 +1000 @@
 void ^?{}(semaphore & this) {}
 
-void P(semaphore & this) with( this ){
+bool P(semaphore & this) with( this ){
         lock( lock __cfaabi_dbg_ctx2 );
         count -= 1;
@@ -970 +1010 @@
                 unlock( lock );
                 park( __cfaabi_dbg_ctx );
+                return true;
         }
         else {
             unlock( lock );
+            return false;
         }
 }
@@ -989 +1031 @@
         // make new owner
         unpark( thrd __cfaabi_dbg_ctx2 );
+
+        return thrd != 0p;
+}
+
+bool V(semaphore & this, unsigned diff) with( this ) {
+        $thread * thrd = 0p;
+        lock( lock __cfaabi_dbg_ctx2 );
+        int release = max(-count, (int)diff);
+        count += diff;
+        for(release) {
+                unpark( pop_head( waiting ) __cfaabi_dbg_ctx2 );
+        }
+
+        unlock( lock );
 
         return thrd != 0p;