summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-01-26 15:01:03 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-01-26 15:01:03 +0000
commitcd2773d8030b1c978bfda6a30f396592a4a94be4 (patch)
treec0c10a3bc376eb9c2b9de6bbe945f03e2f0fb115
parent3b97d0d07bad34afb18fb8b120b037e0f91fe9ee (diff)
downloadhaskell-cd2773d8030b1c978bfda6a30f396592a4a94be4.tar.gz
comment-out an incorrect assertion
-rw-r--r--rts/Capability.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/rts/Capability.c b/rts/Capability.c
index bd781e9cd7..c37ec4e0ad 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -394,7 +394,10 @@ releaseCapability_ (Capability* cap,
// give this Capability to the appropriate Task.
if (!emptyRunQueue(cap) && cap->run_queue_hd->bound) {
// Make sure we're not about to try to wake ourselves up
- ASSERT(task != cap->run_queue_hd->bound);
+ // ASSERT(task != cap->run_queue_hd->bound);
+ // assertion is false: in schedule() we force a yield after
+ // ThreadBlocked, but the thread may be back on the run queue
+ // by now.
task = cap->run_queue_hd->bound;
giveCapabilityToTask(cap,task);
return;