X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FItimer.c;h=74801dba542ca6a45b0cf2cc7dc97c20ff2c4cf9;hb=9e6162f9d0102d1f5738bf78258b24ea5a647ea4;hp=812557cb1dd16a140c0f0321801a832485b3b7b3;hpb=6339f4b081ea645bbba52d2c8a2dd38713b9ef2a;p=ghc-hetmet.git diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c index 812557c..74801db 100644 --- a/ghc/rts/Itimer.c +++ b/ghc/rts/Itimer.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Itimer.c,v 1.21 2001/02/27 12:43:45 rrt 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,104 +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; - -/* ----------------------------------------------------------------------------- - Tick handler - - We use the ticker for 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 -handle_tick(UINT uID STG_UNUSED, UINT uMsg STG_UNUSED, DWORD dwUser STG_UNUSED, - DWORD dw1 STG_UNUSED, DWORD d STG_UNUSED) -#else -handle_tick(int unused STG_UNUSED) -#endif +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; -LPTIMECALLBACK vtalrm_cback; + sigemptyset(&action.sa_mask); + action.sa_flags = 0; -nat -initialize_virtual_timer(nat ms) -{ - /* On Win32 setups that don't have support for - setitimer(), we use the MultiMedia API's timer - support. - - The delivery of ticks isn't free; the performance hit should be checked. - */ - unsigned int delay; - static unsigned int vtalrm_id; - - if (ms) { - 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 1 ms */ - vtalrm_cback, - TIME_CALLBACK_FUNCTION, /* ordinary callback */ - TIME_PERIODIC); - } else { - timeKillEvent(vtalrm_id); - timeEndPeriod(1); - } - - 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"); */ @@ -145,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)); @@ -155,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; @@ -178,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); -} -# endif - -#if defined(mingw32_TARGET_OS) || (defined(cygwin32_TARGET_OS) && !defined(HAVE_SETITIMER)) -int -install_vtalrm_handler(void) -{ - vtalrm_cback = handle_tick; - return 0; + return timer_settime(tid, TIMER_RELTIME, &it, NULL); } -#else int -install_vtalrm_handler(void) +stopTicker() { - 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) { @@ -230,7 +163,6 @@ unblock_vtalrm_signal(void) /* gettimeofday() takes around 1us on our 500MHz PIII. Since we're * only calling it 50 times/s, it shouldn't have any great impact. */ -#if !defined(mingw32_TARGET_OS) unsigned int getourtimeofday(void) { @@ -239,10 +171,4 @@ getourtimeofday(void) return (tv.tv_sec * TICK_FREQUENCY + tv.tv_usec * TICK_FREQUENCY / 1000000); } -#else -unsigned int -getourtimeofday(void) -{ - return ((unsigned int)GetTickCount() * TICK_FREQUENCY) / 1000; -} -#endif +