X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FTimer.c;h=0e0b5386b759530934ca135c98d6148a3e51cb56;hp=0bfea2d6fd9236224c1bec0e359874a9f497d2e1;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/rts/Timer.c b/rts/Timer.c
index 0bfea2d..0e0b538 100644
--- a/rts/Timer.c
+++ b/rts/Timer.c
@@ -17,10 +17,12 @@
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "Proftimer.h"
+#include "Storage.h"
 #include "Schedule.h"
 #include "Timer.h"
 #include "Ticker.h"
 #include "Capability.h"
+#include "RtsSignals.h"
 
 /* ticks left before next pre-emptive context switch */
 static int ticks_to_ctxt_switch = 0;
@@ -40,9 +42,7 @@ static
 void
 handle_tick(int unused STG_UNUSED)
 {
-#ifdef PROFILING
   handleProfTick();
-#endif
   if (RtsFlags.ConcFlags.ctxtSwitchTicks > 0) {
       ticks_to_ctxt_switch--;
       if (ticks_to_ctxt_switch <= 0) {
@@ -53,30 +53,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 */
-	  
-	  /* 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();
+	  wakeUpRts();
       }
       break;
   default:
@@ -85,18 +81,17 @@ handle_tick(int unused STG_UNUSED)
 #endif
 }
 
-int
-startTimer(nat ms)
+void
+startTimer(void)
 {
-#ifdef PROFILING
   initProfTimer();
-#endif
-
-  return startTicker(ms, handle_tick);
+  if (RtsFlags.MiscFlags.tickInterval != 0) {
+      startTicker(RtsFlags.MiscFlags.tickInterval, handle_tick);
+  }
 }
 
-int
-stopTimer()
+void
+stopTimer(void)
 {
-  return stopTicker();
+  stopTicker();
 }