[project @ 2000-05-11 15:11:24 by panne]

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

diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c
index 0db283c..60e30e7 100644 (file)
--- a/ghc/rts/Itimer.c
+++ b/ghc/rts/Itimer.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.c,v 1.8 2000/01/13 12:40:15 simonmar Exp $
+ * $Id: Itimer.c,v 1.13 2000/04/03 15:54:49 simonmar Exp $
  *
  * (c) The GHC Team, 1995-1999
  *
@@ -24,6 +24,7 @@
 
 #include "Rts.h"
 #include "Itimer.h"
+#include "Proftimer.h"
 #include "Schedule.h"
 
 /* As recommended in the autoconf manual */
@@ -43,9 +44,13 @@
 #endif
  
 lnat total_ticks = 0;
-rtsBool do_prof_ticks = rtsFalse;
 
-static void handle_tick(int unused STG_UNUSED);
+static
+void
+#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER))
+CALLBACK
+#endif
+handle_tick(int unused STG_UNUSED);
 
 /* -----------------------------------------------------------------------------
    Tick handler
@@ -58,15 +63,17 @@ static void handle_tick(int unused STG_UNUSED);
    signal handler.
    -------------------------------------------------------------------------- */
 
-static void
+static
+void
+#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER))
+CALLBACK
+#endif
 handle_tick(int unused STG_UNUSED)
 {
   total_ticks++;
 
 #ifdef PROFILING
-  if (do_prof_ticks = rtsTrue) {
-    CCS_TICK(CCCS);
-  }
+  handleProfTick();
 #endif
 
   /* For threadDelay etc., see Select.c */
@@ -87,6 +94,22 @@ handle_tick(int unused STG_UNUSED)
 
 #if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER))
 
+/* 
+ * Sigh - to avoid requiring anyone that wants to build ghc to have
+ * to augment the Win32 header files that comes with cygwinb20.1,
+ * include the missing MM API decls here inline.
+ *
+ * ToDo: check and remove these once the next version of cygwin is
+ * released.
+ */
+#define TIMERR_NOERROR   0
+#define TIMERR_NOCANDO   97
+#define TIME_PERIODIC    1
+
+typedef UINT MMRESULT;
+typedef void CALLBACK (*TIMECALLBACK) (UINT, UINT, DWORD, DWORD, DWORD);
+typedef TIMECALLBACK *LPTIMECALLBACK;
+MMRESULT STDCALL  timeSetEvent(UINT, UINT, LPTIMECALLBACK, DWORD, UINT);
 /*
   vtalrm_handler is assigned and set up in Signals.c
 
@@ -133,7 +156,7 @@ nat
 initialize_virtual_timer(nat ms)
 {
 # ifndef HAVE_SETITIMER
-    fprintf(stderr, "No virtual timer on this system\n");
+  /*    fprintf(stderr, "No virtual timer on this system\n"); */
     return -1;
 # else
     struct itimerval it;
@@ -213,3 +236,13 @@ unblock_vtalrm_signal(void)
     (void) sigprocmask(SIG_UNBLOCK, &signals, NULL);
 }
 #endif
+
+#if !defined(HAVE_SETITIMER) && !defined(mingw32_TARGET_OS)
+unsigned int 
+getourtimeofday(void)
+{
+  struct timeval tv;
+  gettimeofday(&tv, (struct timezone *) NULL);
+  return (tv.tv_sec * 1000000 + tv.tv_usec);
+}
+#endif