X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTimer.c;h=493fe3d35f9c697dab5a107b06446eaadd70f57c;hb=ca5ded310c0a596be199a3da5f14be2fb2020687;hp=4b13be45565115ed4fbad0994d811803470e2b2f;hpb=7a1f8fbdbab99465793c50bd9fb376c950e7e9d7;p=ghc-hetmet.git

diff --git a/rts/Timer.c b/rts/Timer.c
index 4b13be4..493fe3d 100644
--- a/rts/Timer.c
+++ b/rts/Timer.c
@@ -17,6 +17,7 @@
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "Proftimer.h"
+#include "Storage.h"
 #include "Schedule.h"
 #include "Timer.h"
 #include "Ticker.h"
@@ -54,37 +55,26 @@ handle_tick(int unused STG_UNUSED)
 
 #if defined(THREADED_RTS)
   /* 
-   * If we've been inactive for idleGCDelayTicks (set by +RTS
+   * If we've been inactive for idleGCDelayTime (set by +RTS
    * -I), tell the scheduler to wake up and do a GC, to check
    * for threads that are deadlocked.
    */
   switch (recent_activity) {
   case ACTIVITY_YES:
       recent_activity = ACTIVITY_MAYBE_NO;
-      ticks_to_gc = RtsFlags.GcFlags.idleGCDelayTicks;
+      ticks_to_gc = RtsFlags.GcFlags.idleGCDelayTime /
+                    RtsFlags.MiscFlags.tickInterval;
       break;
   case ACTIVITY_MAYBE_NO:
       if (ticks_to_gc == 0) break; /* 0 ==> no idle GC */
       ticks_to_gc--;
       if (ticks_to_gc == 0) {
-	  ticks_to_gc = RtsFlags.GcFlags.idleGCDelayTicks;
+	  ticks_to_gc = RtsFlags.GcFlags.idleGCDelayTime /
+                        RtsFlags.MiscFlags.tickInterval;
 	  recent_activity = ACTIVITY_INACTIVE;
 	  blackholes_need_checking = rtsTrue;
 	  /* hack: re-use the blackholes_need_checking flag */
-	  
-#if !defined(mingw32_HOST_OS)
-	  // This forces the IO Manager thread to wakeup, which will
-	  // in turn ensure that some OS thread wakes up and runs the
-	  // scheduler loop, which will cause a GC and deadlock check.
-	  ioManagerWakeup();
-#else
-	  /* ToDo: this doesn't work.  Can't invoke
-	   * pthread_cond_signal from a signal handler.
-	   * Furthermore, we can't prod a capability that we
-	   * might be holding.  What can we do?
-	   */
-	  prodOneCapability();
-#endif
+	  wakeUpRts();
       }
       break;
   default:
@@ -93,18 +83,18 @@ handle_tick(int unused STG_UNUSED)
 #endif
 }
 
-int
-startTimer(nat ms)
+void
+startTimer(void)
 {
 #ifdef PROFILING
   initProfTimer();
 #endif
 
-  return startTicker(ms, handle_tick);
+  startTicker(RtsFlags.MiscFlags.tickInterval, handle_tick);
 }
 
-int
-stopTimer()
+void
+stopTimer(void)
 {
-  return stopTicker();
+  stopTicker();
 }