Changes in src/libcfa/concurrency/kernel.c [eafb094:77e6fcb]

File:

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

src/libcfa/concurrency/kernel.c

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2017
+// Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Thierry Delisle
 // Last Modified On : --
@@ -20 +20 @@
 
 //Header
-#include "kernel_private.h"
+#include "kernel"
 
 //C Includes
 #include <stddef.h>
 extern "C" {
-#include <fenv.h>
 #include <sys/resource.h>
 }
@@ -31 +30 @@
 //CFA Includes
 #include "libhdr.h"
+#include "threads"
 
 //Private includes
@@ -38 +38 @@
 //-----------------------------------------------------------------------------
 // Kernel storage
+struct processorCtx_t {
+        processor * proc;
+        coroutine c;
+};
+
+DECL_COROUTINE(processorCtx_t);
+
 #define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]
 
@@ -85 +92 @@
 
         rlimit r;
-        getrlimit( RLIMIT_STACK, &r);
+        int ret = getrlimit( RLIMIT_STACK, &r);
         this->size = r.rlim_cur;
 
@@ -107 +114 @@
         this->name = "Main Thread";
         this->errno_ = 0;
-        this->state = Start;
+        this->state = Inactive;
+        this->notHalted = true;
 }
 
@@ -119 +127 @@
         (&this->c){};
         this->proc = proc;
-        proc->runner = this;
+        proc->ctx = this;
 }
 
@@ -125 +133 @@
         (&this->c){ info };
         this->proc = proc;
-        proc->runner = this;
-}
+        proc->ctx = this;
+}
+
+void start(processor * this);
 
 void ?{}(processor * this) {
@@ -136 +146 @@
         this->current_coroutine = NULL;
         this->current_thread = NULL;
-        (&this->terminated){};
-        this->is_terminated = false;
+        (&this->lock){};
+        this->terminated = false;
 
         start( this );
 }
 
-void ?{}(processor * this, cluster * cltr, processorCtx_t * runner) {
+void ?{}(processor * this, cluster * cltr, processorCtx_t * ctx) {
         this->cltr = cltr;
         this->current_coroutine = NULL;
         this->current_thread = NULL;
-        (&this->terminated){};
-        this->is_terminated = false;
-
-        this->runner = runner;
-        LIB_DEBUG_PRINTF("Kernel : constructing processor context %p\n", runner);
-        runner{ this };
+        (&this->lock){};
+        this->terminated = false;
+
+        this->ctx = ctx;
+        LIB_DEBUG_PRINTF("Kernel : constructing processor context %p\n", ctx);
+        ctx{ this };
 }
 
 void ^?{}(processor * this) {
-        if( ! this->is_terminated ) {
+        if( ! this->terminated ) {
                 LIB_DEBUG_PRINTF("Kernel : core %p signaling termination\n", this);
-                this->is_terminated = true;
-                wait( &this->terminated );
+                this->terminated = true;
+                lock( &this->lock );
         }
 }
@@ -164 +174 @@
 void ?{}(cluster * this) {
         ( &this->ready_queue ){};
-        ( &this->lock ){};
+        pthread_spin_init( &this->lock, PTHREAD_PROCESS_PRIVATE );
 }
 
 void ^?{}(cluster * this) {
-        
-}
-
-//=============================================================================================
-// Kernel Scheduling logic
-//=============================================================================================
-//Main of the processor contexts
-void main(processorCtx_t * runner) {
-        processor * this = runner->proc;
+        pthread_spin_destroy( &this->lock );
+}
+
+//-----------------------------------------------------------------------------
+// Processor running routines
+void main(processorCtx_t * ctx);
+thread * nextThread(cluster * this);
+void scheduleInternal(processor * this, thread * dst);
+void spin(processor * this, unsigned int * spin_count);
+
+void main(processorCtx_t * ctx) {
+        processor * this = ctx->proc;
         LIB_DEBUG_PRINTF("Kernel : core %p starting\n", this);
 
         thread * readyThread = NULL;
-        for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ ) 
-        {
+        for( unsigned int spin_count = 0; ! this->terminated; spin_count++ ) {
+                
                 readyThread = nextThread( this->cltr );
 
-                if(readyThread) 
-                {
-                        runThread(this, readyThread);
-
-                        //Some actions need to be taken from the kernel
-                        finishRunning(this);
-
+                if(readyThread) {
+                        scheduleInternal(this, readyThread);
                         spin_count = 0;
-                } 
-                else 
-                {
+                } else {
                         spin(this, &spin_count);
                 }               
@@ -200 +206 @@
 
         LIB_DEBUG_PRINTF("Kernel : core %p unlocking thread\n", this);
-        signal( &this->terminated );
+        unlock( &this->lock );
         LIB_DEBUG_PRINTF("Kernel : core %p terminated\n", this);
 }
 
-// runThread runs a thread by context switching 
+//Declarations for scheduleInternal
+extern void ThreadCtxSwitch(coroutine * src, coroutine * dst);
+
+// scheduleInternal runs a thread by context switching 
 // from the processor coroutine to the target thread 
-void runThread(processor * this, thread * dst) {
-        coroutine * proc_cor = get_coroutine(this->runner);
-        coroutine * thrd_cor = get_coroutine(dst);
-        
-        //Reset the terminating actions here
-        this->finish.action_code = No_Action;
-
-        //Update global state
-        this->current_thread = dst;
-
-        // Context Switch to the thread
-        ThreadCtxSwitch(proc_cor, thrd_cor);
-        // when ThreadCtxSwitch returns we are back in the processor coroutine
-}
-
-// Once a thread has finished running, some of 
-// its final actions must be executed from the kernel
-void finishRunning(processor * this) {
-        if( this->finish.action_code == Release ) {
-                unlock( this->finish.lock );
-        }
-        else if( this->finish.action_code == Schedule ) {
-                ScheduleThread( this->finish.thrd );
-        }
-        else if( this->finish.action_code == Release_Schedule ) {
-                unlock( this->finish.lock );            
-                ScheduleThread( this->finish.thrd );
-        }
-        else {
-                assert(this->finish.action_code == No_Action);
-        }
+void scheduleInternal(processor * this, thread * dst) {
+        // coroutine * proc_ctx = get_coroutine(this->ctx);
+        // coroutine * thrd_ctx = get_coroutine(dst);
+
+        // //Update global state
+        // this->current_thread = dst;
+
+        // // Context Switch to the thread
+        // ThreadCtxSwitch(proc_ctx, thrd_ctx);
+        // // when ThreadCtxSwitch returns we are back in the processor coroutine
+
+        coroutine * proc_ctx = get_coroutine(this->ctx);
+        coroutine * thrd_ctx = get_coroutine(dst);
+      thrd_ctx->last = proc_ctx;
+ 
+      // context switch to specified coroutine
+      // Which is now the current_coroutine
+      LIB_DEBUG_PRINTF("Kernel : switching to ctx %p (from %p, current %p)\n", thrd_ctx, proc_ctx, this->current_coroutine);
+      this->current_thread = dst;
+      this->current_coroutine = thrd_ctx;
+      CtxSwitch( proc_ctx->stack.context, thrd_ctx->stack.context );
+      this->current_coroutine = proc_ctx;
+      LIB_DEBUG_PRINTF("Kernel : returned from ctx %p (to %p, current %p)\n", thrd_ctx, proc_ctx, this->current_coroutine);
+ 
+      // when CtxSwitch returns we are back in the processor coroutine
 }
 
@@ -259 +262 @@
         processorCtx_t proc_cor_storage = { proc, &info };
 
-        LIB_DEBUG_PRINTF("Coroutine : created stack %p\n", proc_cor_storage.c.stack.base);
-
         //Set global state
-        proc->current_coroutine = &proc->runner->c;
+        proc->current_coroutine = &proc->ctx->c;
         proc->current_thread = NULL;
 
         //We now have a proper context from which to schedule threads
-        LIB_DEBUG_PRINTF("Kernel : core %p created (%p, %p)\n", proc, proc->runner, &ctx);
+        LIB_DEBUG_PRINTF("Kernel : core %p created (%p)\n", proc, proc->ctx);
 
         // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't 
@@ -274 +275 @@
         proc_cor_storage.c.state = Active;
       main( &proc_cor_storage );
-      proc_cor_storage.c.state = Halted;
+      proc_cor_storage.c.state = Halt;
+      proc_cor_storage.c.notHalted = false;
 
         // Main routine of the core returned, the core is now fully terminated
-        LIB_DEBUG_PRINTF("Kernel : core %p main ended (%p)\n", proc, proc->runner);     
+        LIB_DEBUG_PRINTF("Kernel : core %p main ended (%p)\n", proc, proc->ctx);        
 
         return NULL;
@@ -285 +287 @@
         LIB_DEBUG_PRINTF("Kernel : Starting core %p\n", this);
         
-        // pthread_attr_t attributes;
-        // pthread_attr_init( &attributes );
-
-        pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
-
-        // pthread_attr_destroy( &attributes );
+        pthread_attr_t attributes;
+        pthread_attr_init( &attributes );
+
+        pthread_create( &this->kernel_thread, &attributes, CtxInvokeProcessor, (void*)this );
+
+        pthread_attr_destroy( &attributes );
 
         LIB_DEBUG_PRINTF("Kernel : core %p started\n", this);   
@@ -297 +299 @@
 //-----------------------------------------------------------------------------
 // Scheduler routines
-void ScheduleThread( thread * thrd ) {
+void thread_schedule( thread * thrd ) {
         assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
-        lock( &systemProcessor->cltr->lock );
+        pthread_spinlock_guard guard = { &systemProcessor->cltr->lock };
         append( &systemProcessor->cltr->ready_queue, thrd );
-        unlock( &systemProcessor->cltr->lock );
 }
 
 thread * nextThread(cluster * this) {
-        lock( &this->lock );
-        thread * head = pop_head( &this->ready_queue );
-        unlock( &this->lock );
-        return head;
-}
-
-void ScheduleInternal() {
-        suspend();
-}
-
-void ScheduleInternal( spinlock * lock ) {
-        get_this_processor()->finish.action_code = Release;
-        get_this_processor()->finish.lock = lock;
-        suspend();
-}
-
-void ScheduleInternal( thread * thrd ) {
-        get_this_processor()->finish.action_code = Schedule;
-        get_this_processor()->finish.thrd = thrd;
-        suspend();
-}
-
-void ScheduleInternal( spinlock * lock, thread * thrd ) {
-        get_this_processor()->finish.action_code = Release_Schedule;
-        get_this_processor()->finish.lock = lock;
-        get_this_processor()->finish.thrd = thrd;
-        suspend();
+        pthread_spinlock_guard guard = { &this->lock };
+        return pop_head( &this->ready_queue );
 }
 
@@ -338 +314 @@
 // Kernel boot procedures
 void kernel_startup(void) {
-        LIB_DEBUG_PRINTF("Kernel : Starting\n");        
-
-        // Start by initializing the main thread
+
         // SKULLDUGGERY: the mainThread steals the process main thread 
         // which will then be scheduled by the systemProcessor normally
+        LIB_DEBUG_PRINTF("Kernel : Starting\n");        
+
+        current_stack_info_t info;
+
+        // LIB_DEBUG_PRINTF("Kernel : core    base : %p \n", info.base );
+        // LIB_DEBUG_PRINTF("Kernel : core storage : %p \n", info.storage );
+        // LIB_DEBUG_PRINTF("Kernel : core    size : %x \n", info.size );
+        // LIB_DEBUG_PRINTF("Kernel : core   limit : %p \n", info.limit );
+        // LIB_DEBUG_PRINTF("Kernel : core context : %p \n", info.context );
+        // LIB_DEBUG_PRINTF("Kernel : core     top : %p \n", info.top );
+
+        // Start by initializing the main thread
         mainThread = (thread *)&mainThread_storage;
-        current_stack_info_t info;
         mainThread{ &info };
 
@@ -358 +343 @@
         // Add the main thread to the ready queue 
         // once resume is called on systemProcessor->ctx the mainThread needs to be scheduled like any normal thread
-        ScheduleThread(mainThread);
+        thread_schedule(mainThread);
 
         //initialize the global state variables
@@ -368 +353 @@
         // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made. 
-        resume(systemProcessor->runner);
+        resume(systemProcessor->ctx);
 
 
 
         // THE SYSTEM IS NOW COMPLETELY RUNNING
+
+
+
         LIB_DEBUG_PRINTF("Kernel : Started\n--------------------------------------------------\n\n");
 }
@@ -382 +370 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
-        systemProcessor->is_terminated = true;
+        systemProcessor->terminated = true;
         suspend();
 
@@ -389 +377 @@
         // Destroy the system processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
-        ^(systemProcessor->runner){};
+        ^(systemProcessor->ctx){};
         ^(systemProcessor){};
 
@@ -401 +389 @@
 //-----------------------------------------------------------------------------
 // Locks
-void ?{}( spinlock * this ) {
-        this->lock = 0;
-}
-void ^?{}( spinlock * this ) {
-
-}
-
-void lock( spinlock * this ) {
-        for ( unsigned int i = 1;; i += 1 ) {
-                if ( this->lock == 0 && __sync_lock_test_and_set_4( &this->lock, 1 ) == 0 ) break;
+void ?{}( simple_lock * this ) {
+        ( &this->blocked ){};
+}
+
+void ^?{}( simple_lock * this ) {
+
+}
+
+void lock( simple_lock * this ) {
+        {
+                pthread_spinlock_guard guard = { &systemCluster->lock };        //HUGE TEMP HACK which only works if we have a single cluster and is stupid
+                append( &this->blocked, this_thread() );
         }
-}
-
-void unlock( spinlock * this ) {
-        __sync_lock_release_4( &this->lock );
-}
-
-void ?{}( signal_once * this ) {
-        this->condition = false;
-}
-void ^?{}( signal_once * this ) {
-
-}
-
-void wait( signal_once * this ) {
-        lock( &this->lock );
-        if( !this->condition ) {
-                append( &this->blocked, this_thread() );
-                ScheduleInternal( &this->lock );
-                lock( &this->lock );
+        suspend();
+}
+
+void unlock( simple_lock * this ) {
+        thread * it;
+        while( it = pop_head( &this->blocked) ) {
+                thread_schedule( it );
         }
-        unlock( &this->lock );
-}
-
-void signal( signal_once * this ) {
-        lock( &this->lock );
-        {
-                this->condition = true;
-
-                thread * it;
-                while( it = pop_head( &this->blocked) ) {
-                        ScheduleThread( it );
-                }
-        }
-        unlock( &this->lock );
 }