/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/* Time at which to die with SIGALRM (if not TIME_MIN). */
static time_t deadline = TIME_MIN;
-static void setup_timer(void);
-static void setup_signal(int flags);
+static void set_up_timer(void);
+static void set_up_signal(int flags);
static void sigalrm_handler(int);
static void refresh_if_ticked(void);
static time_t time_add(time_t, time_t);
gettimeofday(&now, NULL);
tick = false;
- setup_signal(SA_RESTART);
- setup_timer();
+ set_up_signal(SA_RESTART);
+ set_up_timer();
}
static void
-setup_signal(int flags)
+set_up_signal(int flags)
{
struct sigaction sa;
void
time_disable_restart(void)
{
- setup_signal(0);
+ set_up_signal(0);
}
/* Add SA_RESTART to the flags for SIGALRM, so that any system call that
void
time_enable_restart(void)
{
- setup_signal(SA_RESTART);
+ set_up_signal(SA_RESTART);
}
static void
-setup_timer(void)
+set_up_timer(void)
{
struct itimerval itimer;
void
time_postfork(void)
{
- setup_timer();
+ set_up_timer();
}
/* Forces a refresh of the current time from the kernel. It is not usually
struct rusage rusage;
getrusage(RUSAGE_SELF, &rusage);
- VLOG_WARN("%u ms poll interval (%lld ms user, %lld ms system) "
+ VLOG_WARN("%lld ms poll interval (%lld ms user, %lld ms system) "
"is over %u times the weighted mean interval %u ms "
"(%u samples)",
- (interval + 8) / 16,
+ now - last_wakeup,
timeval_diff_msec(&rusage.ru_utime, &last_rusage->ru_utime),
timeval_diff_msec(&rusage.ru_stime, &last_rusage->ru_stime),
interval / mean_interval,