[project @ 2000-03-21 11:33:12 by rrt]

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

diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c
index bbbb3ad..73794f4 100644 (file)
--- a/ghc/rts/Itimer.c
+++ b/ghc/rts/Itimer.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.c,v 1.5 1999/08/25 16:11:48 simonmar Exp $
+ * $Id: Itimer.c,v 1.12 2000/03/21 11:33:12 rrt Exp $
  *
  * (c) The GHC Team, 1995-1999
  *
@@ -45,22 +45,35 @@
 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
 
    We use the ticker for two things: supporting threadDelay, and time
    profiling.
+
+   SMP note: this signal could be delivered to *any* thread.  We have
+   to ensure that it doesn't matter which thread actually runs the
+   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) {
+  if (do_prof_ticks == rtsTrue) {
     CCS_TICK(CCCS);
   }
 #endif
@@ -83,6 +96,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
 
@@ -96,10 +125,16 @@ 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;
  
@@ -113,6 +148,7 @@ initialize_virtual_timer(nat ms)
                (LPTIMECALLBACK)vtalrm_cback,
                0,
                TIME_PERIODIC);
+# endif
   return 0;
 }
  
@@ -122,7 +158,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;
@@ -149,8 +185,7 @@ initialize_virtual_timer(nat ms)
     se.sigev_signo = SIGVTALRM;
     se.sigev_value.sival_int = SIGVTALRM;
     if (timer_create(CLOCK_VIRTUAL, &se, &tid)) {
-       fprintf(stderr, "Can't create virtual timer.\n");
-       EXIT(EXIT_FAILURE);
+       barf("can't create virtual timer");
     }
     it.it_value.tv_sec = ms / 1000;
     it.it_value.tv_nsec = 1000000 * (ms - 1000 * it.it_value.tv_sec);
@@ -203,3 +238,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