Changes in libcfa/src/concurrency/kernel.cfa [c33c2af:5f5a729]

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);
 static [unsigned idle, unsigned total, * processor] query_idles( & __cluster_proc_list idles );
@@ -213 +213 @@
 
                                 // 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
@@ -331 +331 @@
                                 // 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();
 
@@ -806 +806 @@
 }
 
-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 );
@@ -815 +815 @@
         unlock( this );
         /* paranoid */ verify( ! __preemption_enabled() );
+
+        return true;
 }