From: Simon Marlow <marlowsd@gmail.com>
Date: Fri, 14 Nov 2008 12:10:22 +0000 (+0000)
Subject: don't run sparks if there are other threads on this Capability
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=58852522d1ba4fb647bf2e0a67745a808a7da0c6

don't run sparks if there are other threads on this Capability
---

diff --git a/rts/Capability.c b/rts/Capability.c
index 27a2d51..8dddbc5 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -57,15 +57,18 @@ globalWorkToDo (void)
 StgClosure *
 findSpark (Capability *cap)
 {
-  /* use the normal Sparks.h interface (internally modified to enable
-     concurrent stealing) 
-     and immediately turn the spark into a thread when successful
-  */
   Capability *robbed;
   StgClosurePtr spark;
   rtsBool retry;
   nat i = 0;
 
+  if (!emptyRunQueue(cap)) {
+      // If there are other threads, don't try to run any new
+      // sparks: sparks might be speculative, we don't want to take
+      // resources away from the main computation.
+      return 0;
+  }
+
   // first try to get a spark from our own pool.
   // We should be using reclaimSpark(), because it works without
   // needing any atomic instructions: