Changes in libcfa/src/concurrency/kernel.cfa [1c40091:7768b8d]

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 21 16:46:59 2019
-// Update Count     : 27
+// Last Modified On : Thu Jun 20 17:21:23 2019
+// Update Count     : 25
 //
 
@@ -133 +133 @@
         NULL,
         NULL,
-        { 1, false, false }
+        { 1, false, false },
+        6u //this should be seeded better but due to a bug calling rdtsc doesn't work
 };
 
@@ -209 +210 @@
         this.name = name;
         this.cltr = &cltr;
+        id = -1u;
         terminated{ 0 };
         do_terminate = false;
@@ -238 +240 @@
         this.preemption_rate = preemption_rate;
         ready_queue{};
-        ready_queue_lock{};
-
-        procs{ __get };
+        ready_lock{};
+
         idles{ __get };
         threads{ __get };
@@ -260 +261 @@
 //Main of the processor contexts
 void main(processorCtx_t & runner) {
+        // Because of a bug, we couldn't initialized the seed on construction
+        // Do it here
+        kernelTLS.rand_seed ^= rdtscl();
+
         processor * this = runner.proc;
         verify(this);
@@ -265 +270 @@
         __cfaabi_dbg_print_safe("Kernel : core %p starting\n", this);
 
-        doregister(this->cltr, this);
+        // register the processor unless it's the main thread which is handled in the boot sequence
+        if(this != mainProcessor)
+                this->id = doregister(this->cltr, this);
 
         {
@@ -301 +308 @@
         }
 
-        unregister(this->cltr, this);
-
         V( this->terminated );
+
+        // unregister the processor unless it's the main thread which is handled in the boot sequence
+        if(this != mainProcessor)
+                unregister(this->cltr, this);
 
         __cfaabi_dbg_print_safe("Kernel : core %p terminated\n", this);
@@ -500 +509 @@
 
         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 );
+                ready_schedule_lock(*thrd->curr_cluster, kernelTLS.this_processor);
+                __atomic_acquire(&ready_queue.lock);
+                thrd->ts = rdtscl();
+                bool was_empty = push( ready_queue, thrd );
+                __atomic_unlock(&ready_queue.lock);
+                ready_schedule_unlock(*thrd->curr_cluster, kernelTLS.this_processor);
 
                 if(was_empty) {
@@ -524 +535 @@
 thread_desc * nextThread(cluster * this) with( *this ) {
         verify( ! kernelTLS.preemption_state.enabled );
-        lock( ready_queue_lock __cfaabi_dbg_ctx2 );
-        thread_desc * head = pop_head( ready_queue );
-        unlock( ready_queue_lock );
+
+        ready_schedule_lock(*this, kernelTLS.this_processor);
+                __atomic_acquire(&ready_queue.lock);
+                        thread_desc * head;
+                        __attribute__((unused)) bool _;
+                        [head, _] = pop( ready_queue );
+                __atomic_unlock(&ready_queue.lock);
+        ready_schedule_unlock(*this, kernelTLS.this_processor);
+
         verify( ! kernelTLS.preemption_state.enabled );
         return head;
@@ -688 +705 @@
                 pending_preemption = false;
                 kernel_thread = pthread_self();
+                id = -1u;
 
                 runner{ &this };
@@ -697 +715 @@
         mainProcessor = (processor *)&storage_mainProcessor;
         (*mainProcessor){};
+
+        mainProcessor->id = doregister(mainCluster, mainProcessor);
 
         //initialize the global state variables
@@ -743 +763 @@
         kernel_stop_preemption();
 
+        unregister(mainCluster, mainProcessor);
+
         // Destroy the main processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
         ^(mainProcessor->runner){};
-        ^(mainProcessor){};
+        ^(*mainProcessor){};
 
         // Final step, destroy the main thread since it is no longer needed
-        // Since we provided a stack to this taxk it will not destroy anything
-        ^(mainThread){};
+        // Since we provided a stack to this task it will not destroy anything
+        ^(*mainThread){};
+
+        ^(*mainCluster){};
 
         ^(__cfa_dbg_global_clusters.list){};
@@ -766 +790 @@
         with( *cltr ) {
                 lock      (proc_list_lock __cfaabi_dbg_ctx2);
-                remove    (procs, *this);
                 push_front(idles, *this);
                 unlock    (proc_list_lock);
@@ -780 +803 @@
                 lock      (proc_list_lock __cfaabi_dbg_ctx2);
                 remove    (idles, *this);
-                push_front(procs, *this);
                 unlock    (proc_list_lock);
         }
@@ -819 +841 @@
         if(thrd) {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred while executing thread %.256s (%p)", thrd->self_cor.name, thrd );
-                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+                __cfaabi_dbg_bits_write( abort_text, len );
 
                 if ( &thrd->self_cor != thrd->curr_cor ) {
                         len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", thrd->curr_cor->name, thrd->curr_cor );
-                        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+                        __cfaabi_dbg_bits_write( abort_text, len );
                 }
                 else {
-                        __cfaabi_bits_write( STDERR_FILENO, ".\n", 2 );
+                        __cfaabi_dbg_bits_write( ".\n", 2 );
                 }
         }
         else {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred outside of any thread.\n" );
-                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+                __cfaabi_dbg_bits_write( abort_text, len );
         }
 }
@@ -842 +864 @@
 
 extern "C" {
-        void __cfaabi_bits_acquire() {
+        void __cfaabi_dbg_bits_acquire() {
                 lock( kernel_debug_lock __cfaabi_dbg_ctx2 );
         }
 
-        void __cfaabi_bits_release() {
+        void __cfaabi_dbg_bits_release() {
                 unlock( kernel_debug_lock );
         }
@@ -921 +943 @@
 }
 
-void doregister( cluster * cltr, processor * proc ) {
-        lock      (cltr->proc_list_lock __cfaabi_dbg_ctx2);
-        cltr->nprocessors += 1;
-        push_front(cltr->procs, *proc);
-        unlock    (cltr->proc_list_lock);
-}
-
-void unregister( cluster * cltr, processor * proc ) {
-        lock  (cltr->proc_list_lock __cfaabi_dbg_ctx2);
-        remove(cltr->procs, *proc );
-        cltr->nprocessors -= 1;
-        unlock(cltr->proc_list_lock);
-}
-
 //-----------------------------------------------------------------------------
 // Debug