[project @ 2002-07-03 15:15:24 by sof]

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

diff --git a/ghc/rts/Select.c b/ghc/rts/Select.c
index 585fe7b..0408772 100644 (file)
--- a/ghc/rts/Select.c
+++ b/ghc/rts/Select.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.17 2001/08/14 13:40:09 sewardj Exp $
+ * $Id: Select.c,v 1.19 2001/11/13 13:38:02 simonmar Exp $
  *
  * (c) The GHC Team 1995-1999
  *
@@ -32,12 +32,6 @@
 /* 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 */
          }