X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FItimer.c;h=74801dba542ca6a45b0cf2cc7dc97c20ff2c4cf9;hb=9e6162f9d0102d1f5738bf78258b24ea5a647ea4;hp=99811c7a0359dc181d65ca957d9de434cc1880fc;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c index 99811c7..74801db 100644 --- 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.35 2003/03/29 00:27:11 sof Exp $ * - * (c) The GHC Team, 1995-1998 + * (c) The GHC Team, 1995-1999 * * Interval timer for profiling and pre-emptive scheduling. * @@ -17,13 +17,12 @@ * 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" /* As recommended in the autoconf manual */ # ifdef TIME_WITH_SYS_TIME @@ -36,67 +35,38 @@ # include # endif # endif - -/* - * 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. - */ - -#if defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER) -#include /* OK, bring it all in... */ +#ifdef HAVE_SIGNAL_H +# include +#endif -/* - vtalrm_handler is assigned and set up in - main/Signals.lc. - - vtalrm_id (defined in main/Signals.lc) holds - the system id for the current timer (used to - later block/kill the timer) -*/ -extern nat vtalrm_id; -extern TIMECALLBACK *vtalrm_cback; - -nat -initialize_virtual_timer(nat ms) +static +int +install_vtalrm_handler(TickProc handle_tick) { - /* 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. - */ - 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); - return 0; + struct sigaction action; + + action.sa_handler = handle_tick; + + sigemptyset(&action.sa_mask); + action.sa_flags = 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"); + /* fprintf(stderr, "No virtual timer on this system\n"); */ return -1; # else struct itimerval it; + install_vtalrm_handler(handle_tick); + + timestamp = getourtimeofday(); + it.it_value.tv_sec = ms / 1000; it.it_value.tv_usec = 1000 * (ms - (1000 * it.it_value.tv_sec)); it.it_interval = it.it_value; @@ -104,44 +74,69 @@ 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(); + se.sigev_notify = SIGEV_SIGNAL; 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); it.it_interval = it.it_value; - timer_settime(tid, TIMER_RELTIME, &it, NULL); + return timer_settime(tid, TIMER_RELTIME, &it, NULL); } -# endif int -install_vtalrm_handler(void (*handler)(int)) +stopTicker() { - struct sigaction action; + struct sigevent se; + struct itimerspec it; + timer_t tid; - action.sa_handler = handler; + timestamp = getourtimeofday(); - sigemptyset(&action.sa_mask); - action.sa_flags = 0; - - 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) { @@ -163,3 +158,17 @@ unblock_vtalrm_signal(void) (void) sigprocmask(SIG_UNBLOCK, &signals, NULL); } +#endif + +/* gettimeofday() takes around 1us on our 500MHz PIII. Since we're + * only calling it 50 times/s, it shouldn't have any great impact. + */ +unsigned int +getourtimeofday(void) +{ + struct timeval tv; + gettimeofday(&tv, (struct timezone *) NULL); + return (tv.tv_sec * TICK_FREQUENCY + + tv.tv_usec * TICK_FREQUENCY / 1000000); +} +