summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rts/Capability.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/rts/Capability.c b/rts/Capability.c
index 27a2d51eb4..8dddbc5d34 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: