Changes in / [a073d46:e994912]

Location:

src

Files:

• examples/multicore.c (deleted)
• libcfa/concurrency/coroutines (modified) (1 diff)
• libcfa/concurrency/coroutines.c (modified) (2 diffs)
• libcfa/concurrency/kernel (modified) (4 diffs)
• libcfa/concurrency/kernel.c (modified) (18 diffs)
• libcfa/concurrency/threads.c (modified) (3 diffs)

src/libcfa/concurrency/coroutines

@@ -36 +36 @@
 void ?{}(coStack_t * this);
 void ?{}(coroutine * this);
-void ?{}(coroutine * this, const char * name);
 void ^?{}(coStack_t * this);
 void ^?{}(coroutine * this);

src/libcfa/concurrency/coroutines.c

@@ -62 +62 @@
 void ?{}(coroutine* this) {
         this->name = "Anonymous Coroutine";
-        this->errno_ = 0;
-        this->state = Start;
-      this->notHalted = true;
-        this->starter = NULL;
-        this->last = NULL;
-}
-
-void ?{}(coroutine* this, const char * name) {
-        this->name = name;
         this->errno_ = 0;
         this->state = Start;
@@ -169 +160 @@
         this->context = this->base;
         this->top = (char *)this->context + cxtSize;
-
-        LIB_DEBUG_PRINTF("Coroutine : created stack %p\n", this->base);
 }
 

src/libcfa/concurrency/kernel

@@ -30 +30 @@
 struct cluster {
         simple_thread_list ready_queue;
-        // pthread_spinlock_t lock;
+        pthread_spinlock_t lock;
 };
 
@@ -38 +38 @@
 //-----------------------------------------------------------------------------
 // Processor
-enum ProcessorAction { 
-        Reschedule,
-        NoAction
-};
-
 struct processor {
-        struct processorCtx_t * runner;
+        struct processorCtx_t * ctx;
         cluster * cltr;
         coroutine * current_coroutine;
@@ -51 +46 @@
         simple_lock lock;
         volatile bool terminated;
-        ProcessorAction thread_action;
 };
 
@@ -68 +62 @@
 void unlock( simple_lock * );
 
+struct pthread_spinlock_guard {
+        pthread_spinlock_t * lock;
+};
+
+static inline void ?{}( pthread_spinlock_guard * this, pthread_spinlock_t * lock ) {
+        this->lock = lock;
+        pthread_spin_lock( this->lock );
+}
+
+static inline void ^?{}( pthread_spinlock_guard * this ) {
+        pthread_spin_unlock( this->lock );
+}
+
+// //Simple spinlock implementation from 
+// //http://stackoverflow.com/questions/1383363/is-my-spin-lock-implementation-correct-and-optimal
+// //Not optimal but correct
+// #define VOL 
+
+// struct simple_spinlock {
+//      VOL int lock;
+// };
+
+// extern VOL int __sync_lock_test_and_set( VOL int *, VOL int);
+// extern void __sync_synchronize();
+
+// static inline void lock( simple_spinlock * this ) {
+//     while (__sync_lock_test_and_set(&this->lock, 1)) {
+//         // Do nothing. This GCC builtin instruction
+//         // ensures memory barrier.
+//     }
+// }
+
+// static inline void unlock( simple_spinlock * this ) {
+//     __sync_synchronize(); // Memory barrier.
+//     this->lock = 0;
+// }
+
 #endif //KERNEL_H
 

src/libcfa/concurrency/kernel.c

@@ -25 +25 @@
 #include <stddef.h>
 extern "C" {
-#include <fenv.h>
 #include <sys/resource.h>
 }
@@ -36 +35 @@
 #define __CFA_INVOKE_PRIVATE__
 #include "invoke.h"
-
-static volatile int lock;
-
-void spin_lock( volatile int *lock ) {
-        for ( unsigned int i = 1;; i += 1 ) {
-          if ( *lock == 0 && __sync_lock_test_and_set_4( lock, 1 ) == 0 ) break;
-        }
-}
-
-void spin_unlock( volatile int *lock ) {
-        __sync_lock_release_4( lock );
-}
 
 //-----------------------------------------------------------------------------
@@ -140 +127 @@
         (&this->c){};
         this->proc = proc;
-        proc->runner = this;
+        proc->ctx = this;
 }
 
@@ -146 +133 @@
         (&this->c){ info };
         this->proc = proc;
-        proc->runner = this;
+        proc->ctx = this;
 }
 
@@ -165 +152 @@
 }
 
-void ?{}(processor * this, cluster * cltr, processorCtx_t * runner) {
+void ?{}(processor * this, cluster * cltr, processorCtx_t * ctx) {
         this->cltr = cltr;
         this->current_coroutine = NULL;
@@ -172 +159 @@
         this->terminated = false;
 
-        this->runner = runner;
-        LIB_DEBUG_PRINTF("Kernel : constructing processor context %p\n", runner);
-        runner{ this };
+        this->ctx = ctx;
+        LIB_DEBUG_PRINTF("Kernel : constructing processor context %p\n", ctx);
+        ctx{ this };
 }
 
@@ -187 +174 @@
 void ?{}(cluster * this) {
         ( &this->ready_queue ){};
-        lock = 0;
+        pthread_spin_init( &this->lock, PTHREAD_PROCESS_PRIVATE );
 }
 
 void ^?{}(cluster * this) {
-        
+        pthread_spin_destroy( &this->lock );
 }
 
 //-----------------------------------------------------------------------------
 // Processor running routines
-void main(processorCtx_t *);
+void main(processorCtx_t * ctx);
 thread * nextThread(cluster * this);
 void scheduleInternal(processor * this, thread * dst);
 void spin(processor * this, unsigned int * spin_count);
-void thread_schedule( thread * thrd );
-
-//Main of the processor contexts
-void main(processorCtx_t * runner) {
-        processor * this = runner->proc;
+
+void main(processorCtx_t * ctx) {
+        processor * this = ctx->proc;
         LIB_DEBUG_PRINTF("Kernel : core %p starting\n", this);
-
-        fenv_t envp;
-        fegetenv( &envp );
-        LIB_DEBUG_PRINTF("Kernel : mxcsr %x\n", envp.__mxcsr);
 
         thread * readyThread = NULL;
@@ -235 +216 @@
 // from the processor coroutine to the target thread 
 void scheduleInternal(processor * this, thread * dst) {
-        this->thread_action = NoAction;
-
         // coroutine * proc_ctx = get_coroutine(this->ctx);
         // coroutine * thrd_ctx = get_coroutine(dst);
@@ -247 +226 @@
         // // when ThreadCtxSwitch returns we are back in the processor coroutine
 
-        coroutine * proc_ctx = get_coroutine(this->runner);
+        coroutine * proc_ctx = get_coroutine(this->ctx);
         coroutine * thrd_ctx = get_coroutine(dst);
       thrd_ctx->last = proc_ctx;
@@ -253 +232 @@
       // 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);
+      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);
+      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
-        if(this->thread_action == Reschedule) {
-                thread_schedule( dst );
-        }
 }
 
@@ -286 +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 
@@ -305 +279 @@
 
         // 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;
@@ -313 +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);   
@@ -328 +302 @@
         assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
-        spin_lock( &lock );
+        pthread_spinlock_guard guard = { &systemProcessor->cltr->lock };
         append( &systemProcessor->cltr->ready_queue, thrd );
-        spin_unlock( &lock );
 }
 
 thread * nextThread(cluster * this) {
-        spin_lock( &lock );
-        thread * head = pop_head( &this->ready_queue );
-        spin_unlock( &lock );
-        return head;
+        pthread_spinlock_guard guard = { &this->lock };
+        return pop_head( &this->ready_queue );
 }
 
@@ -343 +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 };
 
@@ -373 +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");
 }
@@ -394 +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){};
 
@@ -416 +399 @@
 void lock( simple_lock * this ) {
         {
-                spin_lock( &lock );
+                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() );
-                spin_unlock( &lock );
         }
         suspend();

src/libcfa/concurrency/threads.c

@@ -24 +24 @@
 
 extern "C" {
-        #include <fenv.h>
         #include <stddef.h>
 }
@@ -92 +91 @@
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );
 
-        fenv_t envp;
-        fegetenv( &envp );
-        LIB_DEBUG_PRINTF("Thread : mxcsr %x\n", envp.__mxcsr);
         LIB_DEBUG_PRINTF("Thread started : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
 
@@ -109 +105 @@
 
 void yield( void ) {
-        get_this_processor()->thread_action = Reschedule;
+        thread_schedule( this_thread() );
         suspend();
 }