Changeset b388ee81 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jun 11, 2020, 6:47:27 PM (4 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:

9b1dcc2

Parents:

61d7bec

Message:

Changed ready RW-Lock to be a single global lock instead of per cluster.
This was needed because otherwise, processors outside the cluster could not schedule threads.

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -125 +125 @@
 //-----------------------------------------------------------------------------
 // Kernel storage
-KERNEL_STORAGE(cluster,         mainCluster);
-KERNEL_STORAGE(processor,       mainProcessor);
-KERNEL_STORAGE($thread, mainThread);
-KERNEL_STORAGE(__stack_t,       mainThreadCtx);
-
-cluster     * mainCluster;
-processor   * mainProcessor;
-$thread * mainThread;
+KERNEL_STORAGE(cluster,              mainCluster);
+KERNEL_STORAGE(processor,            mainProcessor);
+KERNEL_STORAGE($thread,              mainThread);
+KERNEL_STORAGE(__stack_t,            mainThreadCtx);
+KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
+
+cluster              * mainCluster;
+processor            * mainProcessor;
+$thread              * mainThread;
+__scheduler_RWLock_t * __scheduler_lock;
 
 extern "C" {
@@ -262 +264 @@
         this.preemption_rate = preemption_rate;
         ready_queue{};
-        ready_lock{};
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -299 +300 @@
         // register the processor unless it's the main thread which is handled in the boot sequence
         if(this != mainProcessor) {
-                this->id = doregister2(this->cltr, this);
+                this->id = doregister(this);
                 ready_queue_grow( this->cltr );
         }
@@ -345 +346 @@
         if(this != mainProcessor) {
                 ready_queue_shrink( this->cltr );
-                unregister2(this->cltr, this);
+                unregister(this);
         }
         else {
@@ -622 +623 @@
         if (thrd->preempted == __NO_PREEMPTION) thrd->state = Ready;
 
-        ready_schedule_lock(thrd->curr_cluster, kernelTLS.this_processor);
+        ready_schedule_lock( kernelTLS.this_processor );
                 push( thrd->curr_cluster, thrd );
 
                 __wake_one(thrd->curr_cluster);
-        ready_schedule_unlock(thrd->curr_cluster, kernelTLS.this_processor);
+        ready_schedule_unlock( kernelTLS.this_processor );
 
         /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -635 +636 @@
         /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 
-        ready_schedule_lock(this, kernelTLS.this_processor);
+        ready_schedule_lock( kernelTLS.this_processor );
                 $thread * head = pop( this );
-        ready_schedule_unlock(this, kernelTLS.this_processor);
+        ready_schedule_unlock( kernelTLS.this_processor );
 
         /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -749 +750 @@
         __cfa_dbg_global_clusters.lock{};
 
+        // Initialize the global scheduler lock
+        __scheduler_lock = (__scheduler_RWLock_t*)&storage___scheduler_lock;
+        (*__scheduler_lock){};
+
         // Initialize the main cluster
         mainCluster = (cluster *)&storage_mainCluster;
@@ -793 +798 @@
         (*mainProcessor){};
 
-        mainProcessor->id = doregister2(mainCluster, mainProcessor);
+        mainProcessor->id = doregister(mainProcessor);
 
         //initialize the global state variables
@@ -848 +853 @@
         kernel_stop_preemption();
 
-        unregister2(mainCluster, mainProcessor);
+        unregister(mainProcessor);
 
         // Destroy the main processor and its context in reverse order of construction
@@ -866 +871 @@
 
         ^(*mainCluster){};
+
+        ^(*__scheduler_lock){};
 
         ^(__cfa_dbg_global_clusters.list){};