X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FItimer.c;h=74801dba542ca6a45b0cf2cc7dc97c20ff2c4cf9;hb=9e6162f9d0102d1f5738bf78258b24ea5a647ea4;hp=07d6dcd6fe80e572df9bb10ddf7189aebc15cf0c;hpb=5a4ec9379ff8e96ab7a75ea1854bf2005db01050;p=ghc-hetmet.git diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c index 07d6dcd..74801db 100644 --- a/ghc/rts/Itimer.c +++ b/ghc/rts/Itimer.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Itimer.c,v 1.17 2000/08/25 13:12:07 simonmar Exp $ + * $Id: Itimer.c,v 1.35 2003/03/29 00:27:11 sof Exp $ * * (c) The GHC Team, 1995-1999 * @@ -17,13 +17,9 @@ * Hence, we use the old-fashioned @setitimer@ that just about everyone seems * to support. So much for standards. */ - -#if !defined(_AIX) -# define NON_POSIX_SOURCE -#endif - #include "Rts.h" #include "RtsFlags.h" +#include "Timer.h" #include "Itimer.h" #include "Proftimer.h" #include "Schedule.h" @@ -40,117 +36,26 @@ # endif # endif -#if HAVE_WINDOWS_H -# include +#ifdef HAVE_SIGNAL_H +# include #endif - -lnat total_ticks = 0; - -/* ticks left before next pre-emptive context switch */ -int ticks_to_ctxt_switch = 0; - -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 -#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER)) -CALLBACK -#endif -handle_tick(int unused STG_UNUSED) +int +install_vtalrm_handler(TickProc handle_tick) { - total_ticks++; - -#ifdef PROFILING - handleProfTick(); -#endif - - /* so we can get a rough indication of the current time at any point - * without having to call gettimeofday() (see Select.c): - */ - ticks_since_timestamp++; - - ticks_to_ctxt_switch--; - if (ticks_to_ctxt_switch <= 0) { - ticks_to_ctxt_switch = RtsFlags.ConcFlags.ctxtSwitchTicks; - context_switch = 1; /* schedule a context switch */ - } -} - - -/* - * Handling timer events under cygwin32 is not done with signal/setitimer. - * Instead of the two steps of first registering a signal handler to handle - * \tr{SIGVTALRM} and then start generating them via @setitimer()@, we use - * the Multimedia API (MM) and its @timeSetEvent@. (Internally, the MM API - * creates a separate thread that will notify the main thread of timer - * expiry). -- SOF 7/96 - * - * 11/98: if the cygwin DLL supports setitimer(), then use it instead. - */ + struct sigaction action; -#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER)) + action.sa_handler = handle_tick; -/* - vtalrm_handler is assigned and set up in Signals.c - - vtalrm_id (defined in Signals.c) holds - the system id for the current timer (used to - later block/kill it.) -*/ -extern nat vtalrm_id; -TIMECALLBACK *vtalrm_cback; - -nat -initialize_virtual_timer(nat ms) -{ -# 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; - - delay = timeBeginPeriod(1); - if (delay == TIMERR_NOCANDO) { /* error of some sort. */ - return delay; - } - vtalrm_id = - timeSetEvent(ms, /* event every `delay' milliseconds. */ - 1, /* precision is within 5 millisecs. */ - (LPTIMECALLBACK)vtalrm_cback, - 0, - TIME_PERIODIC); -# endif + sigemptyset(&action.sa_mask); + action.sa_flags = 0; - return 0; + return sigaction(SIGVTALRM, &action, NULL); } - -#else -nat -initialize_virtual_timer(nat ms) +int +startTicker(nat ms, TickProc handle_tick) { # ifndef HAVE_SETITIMER /* fprintf(stderr, "No virtual timer on this system\n"); */ @@ -158,8 +63,9 @@ initialize_virtual_timer(nat ms) # else struct itimerval it; + install_vtalrm_handler(handle_tick); + timestamp = getourtimeofday(); - ticks_since_timestamp = 0; it.it_value.tv_sec = ms / 1000; it.it_value.tv_usec = 1000 * (ms - (1000 * it.it_value.tv_sec)); @@ -168,19 +74,32 @@ initialize_virtual_timer(nat ms) # endif } -#endif /* !cygwin32_TARGET_OS */ +int +stopTicker() +{ +# ifndef HAVE_SETITIMER + /* fprintf(stderr, "No virtual timer on this system\n"); */ + return -1; +# else + struct itimerval it; + + it.it_value.tv_sec = 0; + it.it_value.tv_usec = 0; + it.it_interval = it.it_value; + return (setitimer(ITIMER_VIRTUAL, &it, NULL)); +# endif +} # if 0 /* This is a potential POSIX version */ -nat -initialize_virtual_timer(nat ms) +int +startTicker(nat ms) { struct sigevent se; struct itimerspec it; timer_t tid; timestamp = getourtimeofday(); - ticks_since_timestamp = 0; se.sigev_notify = SIGEV_SIGNAL; se.sigev_signo = SIGVTALRM; @@ -191,32 +110,33 @@ initialize_virtual_timer(nat ms) it.it_value.tv_sec = ms / 1000; it.it_value.tv_nsec = 1000000 * (ms - 1000 * it.it_value.tv_sec); it.it_interval = it.it_value; - timer_settime(tid, TIMER_RELTIME, &it, NULL); + return timer_settime(tid, TIMER_RELTIME, &it, NULL); } -# endif -#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER)) int -install_vtalrm_handler(void) +stopTicker() { - vtalrm_cback = handle_tick; - return 0; -} - -#else -int -install_vtalrm_handler(void) -{ - struct sigaction action; - - action.sa_handler = handle_tick; + struct sigevent se; + struct itimerspec it; + timer_t tid; - sigemptyset(&action.sa_mask); - action.sa_flags = 0; + timestamp = getourtimeofday(); - return sigaction(SIGVTALRM, &action, NULL); + se.sigev_notify = SIGEV_SIGNAL; + se.sigev_signo = SIGVTALRM; + se.sigev_value.sival_int = SIGVTALRM; + if (timer_create(CLOCK_VIRTUAL, &se, &tid)) { + barf("can't create virtual timer"); + } + it.it_value.tv_sec = 0; + it.it_value.tv_nsec = 0; + it.it_interval = it.it_value; + return timer_settime(tid, TIMER_RELTIME, &it, NULL); } +# endif +#if 0 +/* Currently unused */ void block_vtalrm_signal(void) { @@ -251,3 +171,4 @@ getourtimeofday(void) return (tv.tv_sec * TICK_FREQUENCY + tv.tv_usec * TICK_FREQUENCY / 1000000); } +