It's always a little risky to track the length of a list by hand, because
it is easy to miss a spot where the length can change. So it seems like
a small cleanup to just measure the length of the 'waiters' list at the
point where we need to know it. list_size() is O(n) in the length of the
list, but the function that calls it is already O(n) in that length so it
seems like a fair trade-off.
/* All active poll waiters. */
static struct list waiters = LIST_INITIALIZER(&waiters);
/* 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
* wait forever. */
static int timeout = -1;
/* Max time to wait in next call to poll_block(), in milliseconds, or -1 to
* wait forever. */
static int timeout = -1;
static size_t max_pollfds;
struct poll_waiter *pw, *next;
static size_t max_pollfds;
struct poll_waiter *pw, *next;
+ int n_waiters, n_pollfds;
int retval;
/* Register fatal signal events before actually doing any real work for
* poll_block. */
fatal_signal_wait();
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);
if (max_pollfds < n_waiters) {
max_pollfds = n_waiters;
pollfds = xrealloc(pollfds, max_pollfds * sizeof *pollfds);
if (pw) {
list_remove(&pw->node);
free(pw);
if (pw) {
list_remove(&pw->node);
free(pw);
waiter->events = events;
waiter->where = where;
list_push_back(&waiters, &waiter->node);
waiter->events = events;
waiter->where = where;
list_push_back(&waiters, &waiter->node);