Changeset 7768b8d for libcfa/src/concurrency/kernel.cfa

Timestamp:

Nov 26, 2019, 3:19:20 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

30763fd

Parents:

21184e3

Message:

First step at adding the new ready queue to Cforall

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -210 +210 @@
         this.name = name;
         this.cltr = &cltr;
+        id = -1u;
         terminated{ 0 };
         do_terminate = false;
@@ -239 +240 @@
         this.preemption_rate = preemption_rate;
         ready_queue{};
-        ready_queue_lock{};
-
-        procs{ __get };
+        ready_lock{};
+
         idles{ __get };
         threads{ __get };
@@ -263 +263 @@
         // Because of a bug, we couldn't initialized the seed on construction
         // Do it here
-        kernelTLS.rand_seed ^= rdtsc();
+        kernelTLS.rand_seed ^= rdtscl();
 
         processor * this = runner.proc;
@@ -270 +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);
 
         {
@@ -306 +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);
@@ -505 +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) {
@@ -529 +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;
@@ -693 +705 @@
                 pending_preemption = false;
                 kernel_thread = pthread_self();
+                id = -1u;
 
                 runner{ &this };
@@ -702 +715 @@
         mainProcessor = (processor *)&storage_mainProcessor;
         (*mainProcessor){};
+
+        mainProcessor->id = doregister(mainCluster, mainProcessor);
 
         //initialize the global state variables
@@ -748 +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){};
@@ -771 +790 @@
         with( *cltr ) {
                 lock      (proc_list_lock __cfaabi_dbg_ctx2);
-                remove    (procs, *this);
                 push_front(idles, *this);
                 unlock    (proc_list_lock);
@@ -785 +803 @@
                 lock      (proc_list_lock __cfaabi_dbg_ctx2);
                 remove    (idles, *this);
-                push_front(procs, *this);
                 unlock    (proc_list_lock);
         }
@@ -926 +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