Changes in src/libcfa/concurrency/kernel.c [85b1deb:a1a17a74]

File:

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

src/libcfa/concurrency/kernel.c

@@ -16 +16 @@
 //C Includes
 #include <stddef.h>
-#include <errno.h>
-#include <string.h>
 extern "C" {
 #include <stdio.h>
@@ -51 +49 @@
 thread_desc * mainThread;
 
-extern "C" {
-struct { __dllist_t(cluster) list; __spinlock_t lock; } __cfa_dbg_global_clusters;
-}
+struct { __dllist_t(cluster    ) list; __spinlock_t lock; } global_clusters;
 
 //-----------------------------------------------------------------------------
@@ -147 +143 @@
         runner.proc = &this;
 
-        idleLock{};
-
         start( &this );
 }
 
 void ^?{}(processor & this) with( this ){
-        if( ! __atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) ) {
+        if( ! do_terminate ) {
                 __cfaabi_dbg_print_safe("Kernel : core %p signaling termination\n", &this);
-
-                __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
-                wake( &this );
-
+                terminate(&this);
+                verify(this.do_terminate);
+                verify( kernelTLS.this_processor != &this);
                 P( terminated );
                 verify( kernelTLS.this_processor != &this);
-        }
-
-        pthread_join( kernel_thread, NULL );
+                pthread_join( kernel_thread, NULL );
+        }
 }
 
@@ -202 +194 @@
 
                 thread_desc * readyThread = NULL;
-                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ )
+                for( unsigned int spin_count = 0; ! this->do_terminate; spin_count++ )
                 {
                         readyThread = nextThread( this->cltr );
@@ -221 +213 @@
                         else
                         {
-                                // spin(this, &spin_count);
-                                halt(this);
+                                spin(this, &spin_count);
                         }
                 }
@@ -266 +257 @@
 // its final actions must be executed from the kernel
 void finishRunning(processor * this) with( this->finish ) {
-        verify( ! kernelTLS.preemption_state.enabled );
-        choose( action_code ) {
-        case No_Action:
-                break;
-        case Release:
+        if( action_code == Release ) {
+                verify( ! kernelTLS.preemption_state.enabled );
                 unlock( *lock );
-        case Schedule:
+        }
+        else if( action_code == Schedule ) {
                 ScheduleThread( thrd );
-        case Release_Schedule:
+        }
+        else if( action_code == Release_Schedule ) {
+                verify( ! kernelTLS.preemption_state.enabled );
                 unlock( *lock );
                 ScheduleThread( thrd );
-        case Release_Multi:
+        }
+        else if( action_code == Release_Multi ) {
+                verify( ! kernelTLS.preemption_state.enabled );
                 for(int i = 0; i < lock_count; i++) {
                         unlock( *locks[i] );
                 }
-        case Release_Multi_Schedule:
+        }
+        else if( action_code == Release_Multi_Schedule ) {
                 for(int i = 0; i < lock_count; i++) {
                         unlock( *locks[i] );
@@ -288 +282 @@
                         ScheduleThread( thrds[i] );
                 }
-        case Callback:
-                callback();
-        default:
-                abort("KERNEL ERROR: Unexpected action to run after thread");
-        }
+        }
+        else {
+                assert(action_code == No_Action);
+        }
+}
+
+// Handles spinning logic
+// TODO : find some strategy to put cores to sleep after some time
+void spin(processor * this, unsigned int * spin_count) {
+        (*spin_count)++;
 }
 
@@ -397 +396 @@
         with( *thrd->curr_cluster ) {
                 lock  ( ready_queue_lock __cfaabi_dbg_ctx2 );
-                bool was_empty = !(ready_queue != 0);
                 append( ready_queue, thrd );
                 unlock( ready_queue_lock );
-
-                if(was_empty) {
-                        lock      (proc_list_lock __cfaabi_dbg_ctx2);
-                        if(idles) {
-                                wake_fast(idles.head);
-                        }
-                        unlock    (proc_list_lock);
-                }
-                else if( struct processor * idle = idles.head ) {
-                        wake_fast(idle);
-                }
-
         }
 
@@ -511 +497 @@
 }
 
-void BlockInternal(__finish_callback_fptr_t callback) {
-        disable_interrupts();
-        with( *kernelTLS.this_processor ) {
-                finish.action_code = Callback;
-                finish.callback    = callback;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
 // KERNEL ONLY
 void LeaveThread(__spinlock_t * lock, thread_desc * thrd) {
@@ -546 +518 @@
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
 
-        __cfa_dbg_global_clusters.list{ __get };
-        __cfa_dbg_global_clusters.lock{};
+        global_clusters.list{ __get };
+        global_clusters.lock{};
 
         // Initialize the main cluster
@@ -628 +600 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
-        __atomic_store_n(&mainProcessor->do_terminate, true, __ATOMIC_RELEASE);
+        mainProcessor->do_terminate = true;
         returnToKernel();
-        mainThread->self_cor.state = Halted;
 
         // THE SYSTEM IS NOW COMPLETELY STOPPED
@@ -646 +617 @@
         ^(mainThread){};
 
-        ^(__cfa_dbg_global_clusters.list){};
-        ^(__cfa_dbg_global_clusters.lock){};
+        ^(global_clusters.list){};
+        ^(global_clusters.lock){};
 
         __cfaabi_dbg_print_safe("Kernel : Shutdown complete\n");
@@ -656 +627 @@
 //=============================================================================================
 
-void halt(processor * this) with( *this ) {
-        // verify( ! __atomic_load_n(&do_terminate, __ATOMIC_SEQ_CST) );
-
-        with( *cltr ) {
-                lock      (proc_list_lock __cfaabi_dbg_ctx2);
-                remove    (procs, *this);
-                push_front(idles, *this);
-                unlock    (proc_list_lock);
-        }
-
-        __cfaabi_dbg_print_safe("Kernel : Processor %p ready to sleep\n", this);
-
-        wait( idleLock );
-
-        __cfaabi_dbg_print_safe("Kernel : Processor %p woke up and ready to run\n", this);
-
-        with( *cltr ) {
-                lock      (proc_list_lock __cfaabi_dbg_ctx2);
-                remove    (idles, *this);
-                push_front(procs, *this);
-                unlock    (proc_list_lock);
-        }
-}
+// void halt(processor * this) with( this ) {
+//      pthread_mutex_lock( &idle.lock );
+
+
+
+//      // SKULLDUGGERY: Even if spurious wake-up is a thing
+//      // spuriously waking up a kernel thread is not a big deal
+//      // if it is very rare.
+//      pthread_cond_wait( &idle.cond, &idle.lock);
+//      pthread_mutex_unlock( &idle.lock );
+// }
+
+// void wake(processor * this) with( this ) {
+//      pthread_mutex_lock  (&idle.lock);
+//      pthread_cond_signal (&idle.cond);
+//      pthread_mutex_unlock(&idle.lock);
+// }
 
 //=============================================================================================
@@ -793 +758 @@
 // Global Queues
 void doregister( cluster     & cltr ) {
-        lock      ( __cfa_dbg_global_clusters.lock __cfaabi_dbg_ctx2);
-        push_front( __cfa_dbg_global_clusters.list, cltr );
-        unlock    ( __cfa_dbg_global_clusters.lock );
+        lock      ( global_clusters.lock __cfaabi_dbg_ctx2);
+        push_front( global_clusters.list, cltr );
+        unlock    ( global_clusters.lock );
 }
 
 void unregister( cluster     & cltr ) {
-        lock  ( __cfa_dbg_global_clusters.lock __cfaabi_dbg_ctx2);
-        remove( __cfa_dbg_global_clusters.list, cltr );
-        unlock( __cfa_dbg_global_clusters.lock );
+        lock  ( global_clusters.lock __cfaabi_dbg_ctx2);
+        remove( global_clusters.list, cltr );
+        unlock( global_clusters.lock );
 }