From: simonmar <unknown>
Date: Thu, 3 Nov 2005 16:34:45 +0000 (+0000)
Subject: [project @ 2005-11-03 16:34:45 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~72
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=71c492fc420ee9d2b6075e6a1bb7b8c2cf5f6b6d;p=ghc-hetmet.git

[project @ 2005-11-03 16:34:45 by simonmar]
schedulePushWork(): don't attempt to move the thread bound to the
current Task to a different Capability.
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index 6528fdd..c2426fa 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -779,7 +779,8 @@ schedulePushWork(Capability *cap USED_WHEN_SMP,
 	for (; t != END_TSO_QUEUE; t = next) {
 	    next = t->link;
 	    t->link = END_TSO_QUEUE;
-	    if (t->what_next == ThreadRelocated) {
+	    if (t->what_next == ThreadRelocated
+		|| t->bound == task) { // don't move my bound thread
 		prev->link = t;
 		prev = t;
 	    } else if (i == n_free_caps) {