X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Ftimeval.c;h=8ad8d06075b63985a37758b9050a40d3067ab93d;hb=bdc0da5ca1264511191b6fa86c2bc56d375e13d1;hp=4c34a1731852fc0219a3bb4b7c78541b9b88265c;hpb=f5c6854a73cb6242297e3aac02ccf2d6a22876b0;p=sliver-openvswitch.git diff --git a/lib/timeval.c b/lib/timeval.c index 4c34a1731..8ad8d0607 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -43,6 +43,7 @@ static struct timeval now; /* Time at which to die with SIGALRM (if not TIME_MIN). */ static time_t deadline = TIME_MIN; +static void set_up_timer(void); static void sigalrm_handler(int); static void refresh_if_ticked(void); static time_t time_add(time_t, time_t); @@ -57,8 +58,6 @@ void time_init(void) { struct sigaction sa; - struct itimerval itimer; - if (inited) { return; } @@ -78,7 +77,15 @@ time_init(void) ovs_fatal(errno, "sigaction(SIGALRM) failed"); } - /* Set up periodic timer. */ + /* Set up periodic signal. */ + set_up_timer(); +} + +static void +set_up_timer(void) +{ + struct itimerval itimer; + itimer.it_interval.tv_sec = 0; itimer.it_interval.tv_usec = TIME_UPDATE_INTERVAL * 1000; itimer.it_value = itimer.it_interval; @@ -87,6 +94,17 @@ time_init(void) } } +/* Set up the interval timer, to ensure that time advances even without calling + * time_refresh(). + * + * A child created with fork() does not inherit the parent's interval timer, so + * this function needs to be called from the child after fork(). */ +void +time_postfork(void) +{ + set_up_timer(); +} + /* Forces a refresh of the current time from the kernel. It is not usually * necessary to call this function, since the time will be refreshed * automatically at least every TIME_UPDATE_INTERVAL milliseconds. */ @@ -294,7 +312,12 @@ log_poll_interval(long long int last_wakeup, const struct rusage *last_rusage) rusage.ru_nvcsw - last_rusage->ru_nvcsw, rusage.ru_nivcsw - last_rusage->ru_nivcsw); } - coverage_log(VLL_WARN, true); + + /* Care should be taken in the value chosen for logging. Depending + * on the configuration, syslog can write changes synchronously, + * which can cause the coverage messages to take longer to log + * than the processing delay that triggered it. */ + coverage_log(VLL_INFO, true); } /* Update exponentially weighted moving average. With these parameters, a