/* -----------------------------------------------------------------------------
*
- * (c) The GHC Team, 1995-1999
+ * (c) The GHC Team, 1995-2007
*
* Interval timer for profiling and pre-emptive scheduling.
*
# include <signal.h>
#endif
+#include <string.h>
+
/* Major bogosity:
*
* In the threaded RTS, we can't set the virtual timer because the
#endif
#if defined(USE_TIMER_CREATE)
-timer_t timer;
+static timer_t timer;
#endif
+static nat itimer_interval = 50;
+
static
void
install_vtalrm_handler(TickProc handle_tick)
}
void
-initTicker (TickProc handle_tick)
+initTicker (nat ms, TickProc handle_tick)
{
install_vtalrm_handler(handle_tick);
timestamp = getourtimeofday();
#endif
+ itimer_interval = ms;
+
#if defined(USE_TIMER_CREATE)
{
struct sigevent ev;
+ // Keep programs like valgrind happy
+ memset(&ev, 0, sizeof(ev));
+
ev.sigev_notify = SIGEV_SIGNAL;
ev.sigev_signo = ITIMER_SIGNAL;
}
void
-startTicker(nat ms)
+startTicker(void)
{
#if defined(USE_TIMER_CREATE)
{
struct itimerspec it;
- it.it_value.tv_sec = ms / 1000;
- it.it_value.tv_nsec = (ms % 1000) * 1000000;
+ it.it_value.tv_sec = itimer_interval / 1000;
+ it.it_value.tv_nsec = (itimer_interval % 1000) * 1000000;
it.it_interval = it.it_value;
if (timer_settime(timer, 0, &it, NULL) != 0) {
{
struct itimerval it;
- it.it_value.tv_sec = ms / 1000;
- it.it_value.tv_usec = (ms % 1000) * 1000;
+ it.it_value.tv_sec = itimer_interval / 1000;
+ it.it_value.tv_usec = (itimer_interval % 1000) * 1000;
it.it_interval = it.it_value;
if (setitimer(ITIMER_FLAVOUR, &it, NULL) != 0) {
void
exitTicker(void)
{
+#if defined(USE_TIMER_CREATE)
timer_delete(timer);
// ignore errors - we don't really care if it fails.
+#endif
}
#if 0
interval = RtsFlags.MiscFlags.tickInterval;
if (interval == 0) { interval = 50; }
gettimeofday(&tv, (struct timezone *) NULL);
- // cast to lnat because nat may be 64 bit when int is only 32 bit
- return ((lnat)tv.tv_sec * 1000 / interval +
- (lnat)tv.tv_usec / (interval * 1000));
+
+ // Avoid overflow when we multiply seconds by 1000. See #2848
+ return (lnat)((StgWord64)tv.tv_sec * 1000 / interval +
+ (StgWord64)tv.tv_usec / (interval * 1000));
}