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

Timestamp:

Nov 19, 2021, 11:23:24 AM (9 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

enum, forall-pointer-decay, master, pthread-emulation

Children:

a633f6f

Parents:

34b8cb7 (diff), 84a6e70 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -124 +124 @@
 static void __wake_one(cluster * cltr);
 
-static void mark_idle (__cluster_proc_list & idles, processor & proc);
+static bool mark_idle (__cluster_proc_list & idles, processor & proc);
 static void mark_awake(__cluster_proc_list & idles, processor & proc);
 
@@ -212 +212 @@
 
                                 // Push self to idle stack
-                                mark_idle(this->cltr->procs, * this);
+                                if(!mark_idle(this->cltr->procs, * this)) continue MAIN_LOOP;
 
                                 // Confirm the ready-queue is empty
@@ -330 +330 @@
                                 // Push self to idle stack
                                 ready_schedule_unlock();
-                                mark_idle(this->cltr->procs, * this);
+                                if(!mark_idle(this->cltr->procs, * this)) goto SEARCH;
                                 ready_schedule_lock();
 
@@ -802 +802 @@
 }
 
-static void mark_idle(__cluster_proc_list & this, processor & proc) {
-        /* paranoid */ verify( ! __preemption_enabled() );
-        lock( this );
+static bool mark_idle(__cluster_proc_list & this, processor & proc) {
+        /* paranoid */ verify( ! __preemption_enabled() );
+        if(!try_lock( this )) return false;
                 this.idle++;
                 /* paranoid */ verify( this.idle <= this.total );
@@ -813 +813 @@
         unlock( this );
         /* paranoid */ verify( ! __preemption_enabled() );
+
+        return true;
 }