[project @ 1999-11-29 18:59:23 by sewardj]

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

diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c
index 99811c7..7003e16 100644 (file)
--- a/ghc/rts/Itimer.c
+++ b/ghc/rts/Itimer.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.c,v 1.2 1998/12/02 13:28:27 simonm Exp $
+ * $Id: Itimer.c,v 1.6 1999/09/16 08:33:54 sof Exp $
  *
- * (c) The GHC Team, 1995-1998
+ * (c) The GHC Team, 1995-1999
  *
  * Interval timer for profiling and pre-emptive scheduling.
  *
@@ -24,6 +24,7 @@
 
 #include "Rts.h"
 #include "Itimer.h"
+#include "Schedule.h"
 
 /* As recommended in the autoconf manual */
 # ifdef TIME_WITH_SYS_TIME
@@ -36,7 +37,39 @@
 #   include <time.h>
 #  endif
 # endif
+
+#if HAVE_WINDOWS_H
+# include <windows.h>
+#endif
  
+lnat total_ticks = 0;
+rtsBool do_prof_ticks = rtsFalse;
+
+static void handle_tick(int unused STG_UNUSED);
+
+/* -----------------------------------------------------------------------------
+   Tick handler
+
+   We use the ticker for two things: supporting threadDelay, and time
+   profiling.
+   -------------------------------------------------------------------------- */
+
+static void
+handle_tick(int unused STG_UNUSED)
+{
+  total_ticks++;
+
+#ifdef PROFILING
+  if (do_prof_ticks = rtsTrue) {
+    CCS_TICK(CCCS);
+  }
+#endif
+
+  /* For threadDelay etc., see Select.c */
+  ticks_since_select++;
+}
+
+
 /*
  * Handling timer events under cygwin32 is not done with signal/setitimer.
  * Instead of the two steps of first registering a signal handler to handle
@@ -48,28 +81,31 @@
  * 11/98: if the cygwin DLL supports setitimer(), then use it instead.
  */
 
-#if defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER)
-
-#include <windows.h>  /* OK, bring it all in... */
+#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER))
 
 /*
-  vtalrm_handler is assigned and set up in
-  main/Signals.lc.
+  vtalrm_handler is assigned and set up in Signals.c
 
-  vtalrm_id (defined in main/Signals.lc) holds
+  vtalrm_id (defined in Signals.c) holds
   the system id for the current timer (used to 
-  later block/kill the timer)
+  later block/kill it.)
 */
 extern nat vtalrm_id;
-extern TIMECALLBACK *vtalrm_cback;
+TIMECALLBACK *vtalrm_cback;
  
 nat
 initialize_virtual_timer(nat ms)
 {
-  /* VTALRM is currently not supported by  cygwin32, 
-     so we use the Timer support provided by the
-     MultiMedia API that is part of Win32. The
-     parameters to timeSetEvent may require some tweaking.
+# ifdef PROFILING
+  /* On Win32 setups that don't have support for
+     setitimer(), we use the MultiMedia API's timer
+     support.
+     
+     As the delivery of ticks isn't free, we only
+     enable it if we really needed, i.e., when profiling.
+     (the RTS now also needs timer ticks to implement
+     threadDelay in non-profiling mode, but the pure
+     Win32 port doesn't support that.....yet.)
   */
   unsigned int delay,vtalrm_id;
  
@@ -83,6 +119,7 @@ initialize_virtual_timer(nat ms)
                (LPTIMECALLBACK)vtalrm_cback,
                0,
                TIME_PERIODIC);
+# endif
   return 0;
 }
  
@@ -129,12 +166,21 @@ initialize_virtual_timer(nat ms)
 }
 # endif
 
+#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER))
+int
+install_vtalrm_handler(void)
+{
+  vtalrm_cback = handle_tick;
+  return 0;
+}
+
+#else
 int
-install_vtalrm_handler(void (*handler)(int))
+install_vtalrm_handler(void)
 {
     struct sigaction action;
 
-    action.sa_handler = handler;
+    action.sa_handler = handle_tick;
 
     sigemptyset(&action.sa_mask);
     action.sa_flags = 0;
@@ -163,3 +209,4 @@ unblock_vtalrm_signal(void)
 
     (void) sigprocmask(SIG_UNBLOCK, &signals, NULL);
 }
+#endif