From: simonmar <unknown>
Date: Thu, 16 Mar 2000 17:33:04 +0000 (+0000)
Subject: [project @ 2000-03-16 17:33:04 by simonmar]
X-Git-Tag: Approximately_9120_patches~4963
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a574c52083f416bc20980b110a5e7fd06abb6a93;p=ghc-hetmet.git

[project @ 2000-03-16 17:33:04 by simonmar]
bug fix in previous commit - NotBlocked is a valid state to be in in
resurrectThreads().
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index c141120..443c7d5 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -1,5 +1,5 @@
 /* ---------------------------------------------------------------------------
- * $Id: Schedule.c,v 1.53 2000/03/16 17:27:13 simonmar Exp $
+ * $Id: Schedule.c,v 1.54 2000/03/16 17:33:04 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -2362,7 +2362,11 @@ resurrectThreads( StgTSO *threads )
       raiseAsync(tso,(StgClosure *)NonTermination_closure);
       break;
     case NotBlocked:
-      barf("resurrectThreads: thread not blocked");
+      /* This might happen if the thread was blocked on a black hole
+       * belonging to a thread that we've just woken up (raiseAsync
+       * can wake up threads, remember...).
+       */
+      continue;
     default:
       barf("resurrectThreads: thread blocked in a strange way");
     }