From: Simon Marlow <marlowsd@gmail.com>
Date: Wed, 10 Dec 2008 16:46:44 +0000 (+0000)
Subject: wake up other Capabilities even when there is only one spark (see #2868)
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=0bff4d75254dabb2c002eace2252a4480bf8474e

wake up other Capabilities even when there is only one spark (see #2868)
---

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 33715b1..38e3a3c 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -777,9 +777,11 @@ schedulePushWork(Capability *cap USED_IF_THREADS,
 
     // Check whether we have more threads on our run queue, or sparks
     // in our pool, that we could hand to another Capability.
-    if ((emptyRunQueue(cap) || cap->run_queue_hd->_link == END_TSO_QUEUE)
-	&& sparkPoolSizeCap(cap) < 2) {
-	return;
+    if (cap->run_queue_hd == END_TSO_QUEUE) {
+        if (sparkPoolSizeCap(cap) < 2) return;
+    } else {
+        if (cap->run_queue_hd->_link == END_TSO_QUEUE &&
+            sparkPoolSizeCap(cap) < 1) return;
     }
 
     // First grab as many free Capabilities as we can.