[project @ 2003-02-22 04:51:50 by sof]

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

diff --git a/ghc/rts/Select.c b/ghc/rts/Select.c
index 5f43ec0..e698d8e 100644 (file)
--- a/ghc/rts/Select.c
+++ b/ghc/rts/Select.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.24 2003/02/21 05:34:16 sof Exp $
+ * $Id: Select.c,v 1.25 2003/02/22 04:51:57 sof Exp $
  *
  * (c) The GHC Team 1995-2002
  *
@@ -7,14 +7,18 @@
  *
  * ---------------------------------------------------------------------------*/
 
+
 /* we're outside the realms of POSIX here... */
 /* #include "PosixSource.h" */
 
 #include "Rts.h"
+#ifndef mingw32_TARGET_OS
+/* to the end */
+
 #include "Schedule.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
-#include "Itimer.h"
+#include "Timer.h"
 #include "Signals.h"
 #include "Capability.h"
 
@@ -26,11 +30,6 @@
 #  include <sys/time.h>
 # endif
 
-# ifdef mingw32_TARGET_OS
-#  include <windows.h>
-#  include "win32/AsyncIO.h"
-# endif
-
 #include <errno.h>
 #include <string.h>
 
@@ -40,11 +39,9 @@ nat timestamp = 0;
 #ifdef RTS_SUPPORTS_THREADS
 static rtsBool isWorkerBlockedInAwaitEvent = rtsFalse;
 static rtsBool workerWakeupPending = rtsFalse;
-#ifndef mingw32_TARGET_OS
 static int workerWakeupPipe[2];
 static rtsBool workerWakeupInited = rtsFalse;
 #endif
-#endif
 
 /* There's a clever trick here to avoid problems when the time wraps
  * around.  Since our maximum delay is smaller than 31 bits of ticks
@@ -95,10 +92,8 @@ awaitEvent(rtsBool wait)
     StgTSO *tso, *prev, *next;
     rtsBool ready;
     fd_set rfd,wfd;
-#ifndef mingw32_TARGET_OS
     int numFound;
     int maxfd = -1;
-#endif
     rtsBool select_succeeded = rtsTrue;
     rtsBool unblock_all = rtsFalse;
     struct timeval tv;
@@ -136,7 +131,6 @@ awaitEvent(rtsBool wait)
          min = 0x7ffffff;
       }
 
-#ifndef mingw32_TARGET_OS
       /* 
        * Collect all of the fd's that we're interested in
        */
@@ -230,22 +224,11 @@ awaitEvent(rtsBool wait)
              barf("select failed");
            }
          }
-#else /* on mingwin */
-#ifdef RTS_SUPPORTS_THREADS
-      isWorkerBlockedInAwaitEvent = rtsTrue;
-#endif
-      RELEASE_LOCK(&sched_mutex);
-      while (1) {
-         if (!awaitRequests(wait)) {
-           Sleep(0); /* don't busy wait */
-         }
-#endif /* mingw32_TARGET_OS */
          ACQUIRE_LOCK(&sched_mutex);
 #ifdef RTS_SUPPORTS_THREADS
           isWorkerBlockedInAwaitEvent = rtsFalse;
 #endif
 
-#ifndef mingw32_TARGET_OS
          /* We got a signal; could be one of ours.  If so, we need
           * to start up the signal handler straight away, otherwise
           * we could block for a long time before the signal is
@@ -257,7 +240,6 @@ awaitEvent(rtsBool wait)
              ACQUIRE_LOCK(&sched_mutex);
              return; /* still hold the lock */
          }
-#endif
 
          /* we were interrupted, return to the scheduler immediately.
           */
@@ -334,7 +316,7 @@ awaitEvent(rtsBool wait)
          }
       }
       
-#if defined(RTS_SUPPORTS_THREADS) && !defined(mingw32_TARGET_OS)
+#if defined(RTS_SUPPORTS_THREADS)
        // if we were woken up by wakeBlockedWorkerThread,
        // read the dummy byte from the pipe
       if(select_succeeded && FD_ISSET(workerWakeupPipe[0], &rfd)) {
@@ -354,11 +336,9 @@ awaitEvent(rtsBool wait)
  * wake it.
  * Must be called with sched_mutex held.
  */
-
 void
 wakeBlockedWorkerThread()
 {
-#ifndef mingw32_TARGET_OS
     if(isWorkerBlockedInAwaitEvent && !workerWakeupPending) {
        unsigned char dummy = 42;       // Any value will do here
        
@@ -366,10 +346,7 @@ wakeBlockedWorkerThread()
        write(workerWakeupPipe[1],&dummy,1);
        workerWakeupPending = rtsTrue;
     }
-#else
-       // The Win32 implementation currently uses a polling loop,
-       // so there is no need to explicitly wake it
-#endif
 }
-
 #endif
+
+#endif /* !mingw_TARGET_OS */