[project @ 2005-05-21 16:09:18 by panne]

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

diff --git a/ghc/rts/Timer.c b/ghc/rts/Timer.c
index 013fd06..5be49a5 100644 (file)
--- a/ghc/rts/Timer.c
+++ b/ghc/rts/Timer.c
@@ -19,8 +19,9 @@
 #include "Proftimer.h"
 #include "Schedule.h"
 #include "Timer.h"
+#include "Capability.h"
 
-#if !defined(mingw32_TARGET_OS)
+#if !defined(mingw32_HOST_OS)
 #include "Itimer.h"
 #else
 #include "win32/Ticker.h"
@@ -29,6 +30,11 @@
 /* ticks left before next pre-emptive context switch */
 static int ticks_to_ctxt_switch = 0;
 
+#if defined(RTS_SUPPORTS_THREADS)
+/* idle ticks left before we perform a GC */
+static int ticks_to_gc = 0;
+#endif
+
 /*
  * Function: handle_tick()
  *
@@ -47,6 +53,36 @@ handle_tick(int unused STG_UNUSED)
       if (ticks_to_ctxt_switch <= 0) {
          ticks_to_ctxt_switch = RtsFlags.ConcFlags.ctxtSwitchTicks;
          context_switch = 1;   /* schedule a context switch */
+
+#if defined(RTS_SUPPORTS_THREADS)
+         /* 
+          * 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 */
+                 threadRunnable();
+                 /* ToDo: this threadRunnable only works if there's
+                  * another thread (not this one) waiting to be woken up
+                  */
+             }
+             break;
+         default:
+             break;
+         }
+#endif
       }
   }
 }