[project @ 2000-07-11 16:24:57 by simonmar]

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

diff --git a/ghc/rts/Select.c b/ghc/rts/Select.c
index 1666b49..79b21ba 100644 (file)
--- a/ghc/rts/Select.c
+++ b/ghc/rts/Select.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.10 2000/03/20 09:42:50 andy Exp $
+ * $Id: Select.c,v 1.12 2000/04/03 15:24:21 rrt Exp $
  *
  * (c) The GHC Team 1995-1999
  *
@@ -52,6 +52,7 @@ awaitEvent(rtsBool wait)
     int numFound;
     nat min, delta;
     int maxfd = -1;
+    rtsBool select_succeeded = rtsTrue;
    
     struct timeval tv;
 #ifndef linux_TARGET_OS
@@ -106,7 +107,7 @@ awaitEvent(rtsBool wait)
        case BlockedOnDelay:
          {
            int candidate; /* signed int is intentional */
-#if defined(HAVE_SETITIMER)
+#if defined(HAVE_SETITIMER) || defined(mingw32_TARGET_OS)
            candidate = tso->block_info.delay;
 #else
            candidate = tso->block_info.target - getourtimeofday();
@@ -165,6 +166,8 @@ awaitEvent(rtsBool wait)
        if (signals_pending()) {
          RELEASE_LOCK(&sched_mutex);
          start_signal_handlers();
+         /* Don't wake up any other threads that were waiting on I/O */
+         select_succeeded = rtsFalse;
          break;
        }
 
@@ -173,6 +176,7 @@ awaitEvent(rtsBool wait)
         */
        if (run_queue_hd != END_TSO_QUEUE) {
          RELEASE_LOCK(&sched_mutex);
+         select_succeeded = rtsFalse;
          break;
        }
        
@@ -209,17 +213,16 @@ awaitEvent(rtsBool wait)
        next = tso->link;
        switch (tso->why_blocked) {
        case BlockedOnRead:
-         ready = FD_ISSET(tso->block_info.fd, &rfd);
+         ready = select_succeeded && FD_ISSET(tso->block_info.fd, &rfd);
          break;
        
        case BlockedOnWrite:
-         ready = FD_ISSET(tso->block_info.fd, &wfd);
+         ready = select_succeeded && FD_ISSET(tso->block_info.fd, &wfd);
          break;
        
        case BlockedOnDelay:
          {
-           int candidate; /* signed int is intentional */
-#if defined(HAVE_SETITIMER)
+#if defined(HAVE_SETITIMER) || defined(mingw32_TARGET_OS)
            if (tso->block_info.delay > delta) {
              tso->block_info.delay -= delta;
              ready = 0;
@@ -228,6 +231,7 @@ awaitEvent(rtsBool wait)
              ready = 1;
            }
 #else
+           int candidate; /* signed int is intentional */
            candidate = tso->block_info.target - getourtimeofday();
            if (candidate < 0) {
              candidate = 0;