Improvements to shutting down of the runtime

[ghc-hetmet.git] / ghc / rts / posix / Select.c

diff --git a/ghc/rts/posix/Select.c b/ghc/rts/posix/Select.c
index effc7c4..e21ced0 100644 (file)
--- a/ghc/rts/posix/Select.c
+++ b/ghc/rts/posix/Select.c
@@ -215,7 +215,7 @@ awaitEvent(rtsBool wait)
 
          /* we were interrupted, return to the scheduler immediately.
           */
-         if (interrupted) {
+         if (sched_state >= SCHED_INTERRUPTING) {
              return; /* still hold the lock */
          }
          
@@ -272,7 +272,8 @@ awaitEvent(rtsBool wait)
          }
       }
       
-    } while (wait && !interrupted && emptyRunQueue(&MainCapability));
+    } while (wait && sched_state == SCHED_RUNNING
+            && emptyRunQueue(&MainCapability));
 }
 
 #endif /* THREADED_RTS */