X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fpoll-loop.c;h=7e328bc24ce486b2243cdfce1929c5464f513b02;hb=7c690f462fec1af60d76c67fac226fc648ea9149;hp=4e192f3ae0eaaacd863ce545247cf698de322850;hpb=959ec62e324d88e47930379d3f0d196119595de9;p=sliver-openvswitch.git diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 4e192f3ae..7e328bc24 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,12 +55,10 @@ struct poll_waiter { /* All active poll waiters. */ static struct list waiters = LIST_INITIALIZER(&waiters); -/* Number of elements in the waiters list. */ -static size_t n_waiters; - -/* Max time to wait in next call to poll_block(), in milliseconds, or -1 to +/* Time at which to wake up the next call to poll_block(), in milliseconds as + * returned by time_msec(), LLONG_MIN to wake up immediately, or LLONG_MAX to * wait forever. */ -static int timeout = -1; +static long long int timeout_when = LLONG_MAX; /* Location where waiter created. */ static const char *timeout_where; @@ -85,16 +83,6 @@ poll_fd_wait(int fd, short int events, const char *where) return new_waiter(fd, events, where); } -/* The caller must ensure that 'msec' is not negative. */ -static void -poll_timer_wait__(int msec, const char *where) -{ - if (timeout < 0 || msec < timeout) { - timeout = msec; - timeout_where = where; - } -} - /* Causes the following call to poll_block() to block for no more than 'msec' * milliseconds. If 'msec' is nonpositive, the following call to poll_block() * will not block at all. @@ -108,14 +96,25 @@ poll_timer_wait__(int msec, const char *where) void poll_timer_wait(long long int msec, const char *where) { - poll_timer_wait__((msec < 0 ? 0 - : msec > INT_MAX ? INT_MAX - : msec), - where); + long long int now = time_msec(); + long long int when; + + if (msec <= 0) { + /* Wake up immediately. */ + when = LLONG_MIN; + } else if ((unsigned long long int) now + msec <= LLONG_MAX) { + /* Normal case. */ + when = now + msec; + } else { + /* now + msec would overflow. */ + when = LLONG_MAX; + } + + poll_timer_wait_until(when, where); } /* Causes the following call to poll_block() to wake up when the current time, - * as returned by time_msec(), reaches 'msec' or later. If 'msec' is earlier + * as returned by time_msec(), reaches 'when' or later. If 'when' is earlier * than the current time, the following call to poll_block() will not block at * all. * @@ -126,13 +125,12 @@ poll_timer_wait(long long int msec, const char *where) * Ordinarily the 'where' argument is supplied automatically; see poll-loop.h * for more information. */ void -poll_timer_wait_until(long long int msec, const char *where) +poll_timer_wait_until(long long int when, const char *where) { - long long int now = time_msec(); - poll_timer_wait__((msec <= now ? 0 - : msec < now + INT_MAX ? msec - now - : INT_MAX), - where); + if (when < timeout_when) { + timeout_when = when; + timeout_where = where; + } } /* Causes the following call to poll_block() to wake up immediately, without @@ -151,15 +149,16 @@ poll_immediate_wake(const char *where) * arguments have two possible interpretations: * * - If 'pollfd' is nonnull then it should be the "struct pollfd" that caused - * the wakeup. In this case, 'timeout' is ignored. + * the wakeup. 'timeout' is ignored. * - * - If 'pollfd' is nonnull then 'timeout' is the number of milliseconds - * after which the poll loop woke up. + * - If 'pollfd' is NULL then 'timeout' is the number of milliseconds after + * which the poll loop woke up. */ static void log_wakeup(const char *where, const struct pollfd *pollfd, int timeout) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(120, 120); + static struct vlog_rate_limit trace_rl = VLOG_RATE_LIMIT_INIT(1, 1); + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 10); enum vlog_level level; int cpu_usage; struct ds s; @@ -202,6 +201,11 @@ log_wakeup(const char *where, const struct pollfd *pollfd, int timeout) } if (cpu_usage >= 0) { ds_put_format(&s, " (%d%% CPU usage)", cpu_usage); + + if (!vlog_should_drop(THIS_MODULE, level, &trace_rl)) { + ds_put_char(&s, '\n'); + format_backtraces(&s, 2); + } } VLOG(level, "%s", ds_cstr(&s)); ds_destroy(&s); @@ -217,13 +221,15 @@ poll_block(void) static size_t max_pollfds; struct poll_waiter *pw, *next; - int n_pollfds; + int n_waiters, n_pollfds; + int elapsed; int retval; /* Register fatal signal events before actually doing any real work for * poll_block. */ fatal_signal_wait(); + n_waiters = list_size(&waiters); if (max_pollfds < n_waiters) { max_pollfds = n_waiters; pollfds = xrealloc(pollfds, max_pollfds * sizeof *pollfds); @@ -238,15 +244,15 @@ poll_block(void) n_pollfds++; } - if (!timeout) { + if (timeout_when == LLONG_MIN) { COVERAGE_INC(poll_zero_timeout); } - retval = time_poll(pollfds, n_pollfds, timeout); + retval = time_poll(pollfds, n_pollfds, timeout_when, &elapsed); if (retval < 0) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "poll: %s", strerror(-retval)); } else if (!retval) { - log_wakeup(timeout_where, NULL, timeout); + log_wakeup(timeout_where, NULL, elapsed); } LIST_FOR_EACH_SAFE (pw, next, node, &waiters) { @@ -256,7 +262,7 @@ poll_block(void) poll_cancel(pw); } - timeout = -1; + timeout_when = LLONG_MAX; timeout_where = NULL; /* Handle any pending signals before doing anything else. */ @@ -275,7 +281,6 @@ poll_cancel(struct poll_waiter *pw) if (pw) { list_remove(&pw->node); free(pw); - n_waiters--; } } @@ -289,6 +294,5 @@ new_waiter(int fd, short int events, const char *where) waiter->events = events; waiter->where = where; list_push_back(&waiters, &waiter->node); - n_waiters++; return waiter; }