X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FTimer.c;h=0bfea2d6fd9236224c1bec0e359874a9f497d2e1;hb=7f24ae51ed36c5c0308a2d0de23e243f32a0043c;hp=1f9db85aad13104c7c2fc78c2507da140ecdabb8;hpb=557947d3f93e11285e36423ddb08d859af60ab47;p=ghc-hetmet.git

diff --git a/ghc/rts/Timer.c b/ghc/rts/Timer.c
index 1f9db85..0bfea2d 100644
--- a/ghc/rts/Timer.c
+++ b/ghc/rts/Timer.c
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------------------
  *
- * (c) The GHC Team, 1995-2003
+ * (c) The GHC Team, 1995-2005
  *
  * Interval timer service for profiling and pre-emptive scheduling.
  *
@@ -19,22 +19,24 @@
 #include "Proftimer.h"
 #include "Schedule.h"
 #include "Timer.h"
-
-#ifndef mingw32_TARGET_OS
-#include "Itimer.h"
-#else
-#include "win32/Ticker.h"
-#endif
+#include "Ticker.h"
+#include "Capability.h"
 
 /* ticks left before next pre-emptive context switch */
 static int ticks_to_ctxt_switch = 0;
 
+#if defined(THREADED_RTS)
+/* idle ticks left before we perform a GC */
+static int ticks_to_gc = 0;
+#endif
+
 /*
  * Function: handle_tick()
  *
  * At each occurrence of a tick, the OS timer will invoke
  * handle_tick().
  */
+static
 void
 handle_tick(int unused STG_UNUSED)
 {
@@ -48,6 +50,39 @@ handle_tick(int unused STG_UNUSED)
 	  context_switch = 1;	/* schedule a context switch */
       }
   }
+
+#if defined(THREADED_RTS)
+  /* 
+   * If we've been inactive for idleGCDelayTicks (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;
+      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 */
+	  
+	  /* 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();
+      }
+      break;
+  default:
+      break;
+  }
+#endif
 }
 
 int
@@ -57,7 +92,7 @@ startTimer(nat ms)
   initProfTimer();
 #endif
 
-  return startTicker(ms);
+  return startTicker(ms, handle_tick);
 }
 
 int