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

diff --git a/rts/Timer.c b/rts/Timer.c
index 4b13be4..dddc754 100644
--- a/rts/Timer.c
+++ b/rts/Timer.c
@@ -14,11 +14,13 @@
  * on platform-specific services to install and run the timers.
  *
  */
+
+#include "PosixSource.h"
 #include "Rts.h"
-#include "RtsFlags.h"
+
+#include "Timer.h"
 #include "Proftimer.h"
 #include "Schedule.h"
-#include "Timer.h"
 #include "Ticker.h"
 #include "Capability.h"
 #include "RtsSignals.h"
@@ -41,50 +43,41 @@ 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) {
 	  ticks_to_ctxt_switch = RtsFlags.ConcFlags.ctxtSwitchTicks;
-	  context_switch = 1;	/* schedule a context switch */
+	  setContextSwitches();	/* schedule a context switch */
       }
   }
 
 #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;
-	  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
+          /* 0 ==> no idle GC */
+          recent_activity = ACTIVITY_DONE_GC;
+          // disable timer signals (see #1623)
+          stopTimer();
+      } else {
+          ticks_to_gc--;
+          if (ticks_to_gc == 0) {
+              ticks_to_gc = RtsFlags.GcFlags.idleGCDelayTime /
+                  RtsFlags.MiscFlags.tickInterval;
+              recent_activity = ACTIVITY_INACTIVE;
+              wakeUpRts();
+          }
       }
       break;
   default:
@@ -93,18 +86,35 @@ handle_tick(int unused STG_UNUSED)
 #endif
 }
 
-int
-startTimer(nat ms)
+void
+initTimer(void)
 {
-#ifdef PROFILING
-  initProfTimer();
-#endif
+    initProfTimer();
+    if (RtsFlags.MiscFlags.tickInterval != 0) {
+        initTicker(RtsFlags.MiscFlags.tickInterval, handle_tick);
+    }
+}
+
+void
+startTimer(void)
+{
+    if (RtsFlags.MiscFlags.tickInterval != 0) {
+        startTicker();
+    }
+}
 
-  return startTicker(ms, handle_tick);
+void
+stopTimer(void)
+{
+    if (RtsFlags.MiscFlags.tickInterval != 0) {
+        stopTicker();
+    }
 }
 
-int
-stopTimer()
+void
+exitTimer (rtsBool wait)
 {
-  return stopTicker();
+    if (RtsFlags.MiscFlags.tickInterval != 0) {
+        exitTicker(wait);
+    }
 }