From: simonmar <unknown>
Date: Tue, 19 Apr 2005 13:39:41 +0000 (+0000)
Subject: [project @ 2005-04-19 13:39:41 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~720
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=14c4df60baa8c86fe7725b821536b3a507511a66;p=ghc-hetmet.git

[project @ 2005-04-19 13:39:41 by simonmar]
In the event of a complete deadlock, we should handle the case when
the main thread is BlockedOnSTM (bug #1183455, the strange error
message only occurs on Windows because on Unix we end up waiting for
^C instead of deadlocking).
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index b4e6558..a5f133e 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -900,6 +900,7 @@ scheduleDetectDeadlock(void)
 	    StgMainThread *m;
 	    m = main_threads;
 	    switch (m->tso->why_blocked) {
+	    case BlockedOnSTM:
 	    case BlockedOnBlackHole:
 	    case BlockedOnException:
 	    case BlockedOnMVar: