Changes in src/libcfa/concurrency/kernel.c [de6319f:01963df]

File:

• src/libcfa/concurrency/kernel.c (modified) (21 diffs)

src/libcfa/concurrency/kernel.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  9 16:11:46 2018
-// Update Count     : 24
+// Last Modified On : Fri Mar 30 18:26:11 2018
+// Update Count     : 23
 //
 
@@ -25 +25 @@
 
 //CFA Includes
-#include "time"
 #include "kernel_private.h"
 #include "preemption.h"
@@ -42 +41 @@
 KERNEL_STORAGE(cluster,           mainCluster);
 KERNEL_STORAGE(processor,         mainProcessor);
+KERNEL_STORAGE(processorCtx_t,    mainProcessorCtx);
 KERNEL_STORAGE(thread_desc,       mainThread);
 KERNEL_STORAGE(machine_context_t, mainThreadCtx);
 
-cluster     * mainCluster;
-processor   * mainProcessor;
+cluster *     mainCluster;
+processor *   mainProcessor;
 thread_desc * mainThread;
 
@@ -64 +64 @@
 
 //-----------------------------------------------------------------------------
-// Struct to steal stack
+// Main thread construction
 struct current_stack_info_t {
         machine_context_t ctx;
@@ -89 +89 @@
 }
 
-//-----------------------------------------------------------------------------
-// Main thread construction
 void ?{}( coStack_t & this, current_stack_info_t * info) with( this ) {
         size      = info->size;
@@ -112 +110 @@
         self_cor{ info };
         curr_cor = &self_cor;
-        curr_cluster = mainCluster;
         self_mon.owner = &this;
         self_mon.recursion = 1;
@@ -128 +125 @@
 //-----------------------------------------------------------------------------
 // Processor coroutine
-void ?{}(processorCtx_t & this) {
-
+void ?{}(processorCtx_t & this) {}
+
+// Construct the processor context of the main processor
+void ?{}(processorCtx_t & this, processor * proc) {
+        (this.__cor){ "Processor" };
+        this.__cor.starter = NULL;
+        this.proc = proc;
 }
 
@@ -138 +140 @@
 }
 
-void ?{}(processor & this, const char * name, cluster & cltr) with( this ) {
-        this.name = name;
-        this.cltr = &cltr;
+void ?{}(processor & this) {
+        this{ mainCluster };
+}
+
+void ?{}(processor & this, cluster * cltr) with( this ) {
+        this.cltr = cltr;
         terminated{ 0 };
         do_terminate = false;
@@ -148 +153 @@
 
         start( &this );
+}
+
+void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) with( this ) {
+        this.cltr = cltr;
+        terminated{ 0 };
+        do_terminate = false;
+        preemption_alarm = NULL;
+        pending_preemption = false;
+        kernel_thread = pthread_self();
+        runner.proc = &this;
+
+        __cfaabi_dbg_print_safe("Kernel : constructing main processor context %p\n", &runner);
+        runner{ &this };
 }
 
@@ -162 +180 @@
 }
 
-void ?{}(cluster & this, const char * name, Duration preemption_rate) with( this ) {
-        this.name = name;
-        this.preemption_rate = preemption_rate;
+void ?{}(cluster & this) with( this ) {
         ready_queue{};
         ready_queue_lock{};
+
+        preemption_rate = default_preemption();
 }
 
@@ -293 +311 @@
         TL_SET( this_coroutine, NULL );
         TL_SET( this_thread, NULL );
-        TL_GET( preemption_state ).[enabled, disable_count] = [false, 1];
+        TL_GET( preemption_state ).enabled = false;
+        TL_GET( preemption_state ).disable_count = 1;
         // SKULLDUGGERY: We want to create a context for the processor coroutine
         // which is needed for the 2-step context switch. However, there is no reason
@@ -382 +401 @@
         verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
 
-        with( *thrd->curr_cluster ) {
+        with( *TL_GET( this_processor )->cltr ) {
                 lock  ( ready_queue_lock __cfaabi_dbg_ctx2 );
                 append( ready_queue, thrd );
@@ -410 +429 @@
 void BlockInternal( __spinlock_t * lock ) {
         disable_interrupts();
-        with( *TL_GET( this_processor ) ) {
-                finish.action_code = Release;
-                finish.lock        = lock;
-        }
+        TL_GET( this_processor )->finish.action_code = Release;
+        TL_GET( this_processor )->finish.lock        = lock;
 
         verify( ! TL_GET( preemption_state ).enabled );
@@ -424 +441 @@
 void BlockInternal( thread_desc * thrd ) {
         disable_interrupts();
-        with( *TL_GET( this_processor ) ) {
-                finish.action_code = Schedule;
-                finish.thrd        = thrd;
-        }
+        TL_GET( this_processor )->finish.action_code = Schedule;
+        TL_GET( this_processor )->finish.thrd        = thrd;
 
         verify( ! TL_GET( preemption_state ).enabled );
@@ -439 +454 @@
         assert(thrd);
         disable_interrupts();
-        with( *TL_GET( this_processor ) ) {
-                finish.action_code = Release_Schedule;
-                finish.lock        = lock;
-                finish.thrd        = thrd;
-        }
+        TL_GET( this_processor )->finish.action_code = Release_Schedule;
+        TL_GET( this_processor )->finish.lock        = lock;
+        TL_GET( this_processor )->finish.thrd        = thrd;
 
         verify( ! TL_GET( preemption_state ).enabled );
@@ -454 +467 @@
 void BlockInternal(__spinlock_t * locks [], unsigned short count) {
         disable_interrupts();
-        with( *TL_GET( this_processor ) ) {
-                finish.action_code = Release_Multi;
-                finish.locks       = locks;
-                finish.lock_count  = count;
-        }
+        TL_GET( this_processor )->finish.action_code = Release_Multi;
+        TL_GET( this_processor )->finish.locks       = locks;
+        TL_GET( this_processor )->finish.lock_count  = count;
 
         verify( ! TL_GET( preemption_state ).enabled );
@@ -469 +480 @@
 void BlockInternal(__spinlock_t * locks [], unsigned short lock_count, thread_desc * thrds [], unsigned short thrd_count) {
         disable_interrupts();
-        with( *TL_GET( this_processor ) ) {
-                finish.action_code = Release_Multi_Schedule;
-                finish.locks       = locks;
-                finish.lock_count  = lock_count;
-                finish.thrds       = thrds;
-                finish.thrd_count  = thrd_count;
-        }
+        TL_GET( this_processor )->finish.action_code = Release_Multi_Schedule;
+        TL_GET( this_processor )->finish.locks       = locks;
+        TL_GET( this_processor )->finish.lock_count  = lock_count;
+        TL_GET( this_processor )->finish.thrds       = thrds;
+        TL_GET( this_processor )->finish.thrd_count  = thrd_count;
 
         verify( ! TL_GET( preemption_state ).enabled );
@@ -486 +495 @@
 void LeaveThread(__spinlock_t * lock, thread_desc * thrd) {
         verify( ! TL_GET( preemption_state ).enabled );
-        with( *TL_GET( this_processor ) ) {
-                finish.action_code = thrd ? Release_Schedule : Release;
-                finish.lock        = lock;
-                finish.thrd        = thrd;
-        }
+        TL_GET( this_processor )->finish.action_code = thrd ? Release_Schedule : Release;
+        TL_GET( this_processor )->finish.lock        = lock;
+        TL_GET( this_processor )->finish.thrd        = thrd;
 
         returnToKernel();
@@ -504 +511 @@
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
 
-        // Initialize the main cluster
-        mainCluster = (cluster *)&storage_mainCluster;
-        (*mainCluster){"Main Cluster"};
-
-        __cfaabi_dbg_print_safe("Kernel : Main cluster ready\n");
-
         // Start by initializing the main thread
         // SKULLDUGGERY: the mainThread steals the process main thread
@@ -519 +520 @@
         __cfaabi_dbg_print_safe("Kernel : Main thread ready\n");
 
-
-
-        // Construct the processor context of the main processor
-        void ?{}(processorCtx_t & this, processor * proc) {
-                (this.__cor){ "Processor" };
-                this.__cor.starter = NULL;
-                this.proc = proc;
-        }
-
-        void ?{}(processor & this) with( this ) {
-                name = "Main Processor";
-                cltr = mainCluster;
-                terminated{ 0 };
-                do_terminate = false;
-                preemption_alarm = NULL;
-                pending_preemption = false;
-                kernel_thread = pthread_self();
-
-                runner{ &this };
-                __cfaabi_dbg_print_safe("Kernel : constructed main processor context %p\n", &runner);
-        }
+        // Initialize the main cluster
+        mainCluster = (cluster *)&storage_mainCluster;
+        (*mainCluster){};
+
+        __cfaabi_dbg_print_safe("Kernel : main cluster ready\n");
 
         // Initialize the main processor and the main processor ctx
         // (the coroutine that contains the processing control flow)
         mainProcessor = (processor *)&storage_mainProcessor;
-        (*mainProcessor){};
+        (*mainProcessor){ mainCluster, *(processorCtx_t *)&storage_mainProcessorCtx };
 
         //initialize the global state variables
@@ -739 +724 @@
                 thrd->dbg_next = NULL;
         }
-
-        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
-                this.prev_name = prev_name;
-                this.prev_thrd = TL_GET( this_thread );
-        }
 )
 // Local Variables: //