[project @ 2002-02-04 20:21:16 by sof]

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

diff --git a/ghc/rts/Select.c b/ghc/rts/Select.c
index 644bb41..0408772 100644 (file)
--- a/ghc/rts/Select.c
+++ b/ghc/rts/Select.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.15 2001/02/27 12:43:45 rrt Exp $
+ * $Id: Select.c,v 1.19 2001/11/13 13:38:02 simonmar Exp $
  *
  * (c) The GHC Team 1995-1999
  *
@@ -8,7 +8,7 @@
  * ---------------------------------------------------------------------------*/
 
 /* we're outside the realms of POSIX here... */
-#define NON_POSIX_SOURCE
+/* #include "PosixSource.h" */
 
 #include "Rts.h"
 #include "Schedule.h"
@@ -26,18 +26,12 @@
 # endif
 
 # ifdef mingw32_TARGET_OS
-#  include <w32api/windows.h>
+#  include <windows.h>
 # endif
 
 /* last timestamp */
 nat timestamp = 0;
 
-/* keep track of the number of ticks since we last called
- * gettimeofday(), to avoid having to call it every time we need
- * a timestamp.
- */
-nat ticks_since_timestamp = 0;
-
 /* 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
  * (it's actually 31 bits of microseconds), we can safely check
@@ -114,7 +108,6 @@ awaitEvent(rtsBool wait)
     do {
 
       ticks = timestamp = getourtimeofday();
-      ticks_since_timestamp = 0;
       if (wakeUpSleepingThreads(ticks)) { 
          return;
       }
@@ -201,7 +194,7 @@ awaitEvent(rtsBool wait)
           */
          if (signals_pending()) {
              RELEASE_LOCK(&sched_mutex); /* ToDo: kill */
-             start_signal_handlers();
+             startSignalHandlers();
              ACQUIRE_LOCK(&sched_mutex);
              return; /* still hold the lock */
          }