From f6d419d22a4c69af185201b30f78b5a88da51219 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Sat, 1 Jun 2013 20:07:40 +1000 Subject: [PATCH] lib/waiter: merge time & io waiter init loops Signed-off-by: Jeremy Kerr --- lib/waiter/waiter.c | 46 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c index 1d9a7d8..b36c1af 100644 --- a/lib/waiter/waiter.c +++ b/lib/waiter/waiter.c @@ -176,34 +176,32 @@ static void update_waiters(struct waitset *set) set->n_time_waiters = n_time; } - /* IO waiters: copy to io_waiters, populate pollfds */ - for (i = i_io = 0; i < set->n_waiters; i++) { - struct waiter *waiter = set->waiters[i]; - - if (waiter->type != WAITER_IO) - continue; - - set->pollfds[i_io].fd = waiter->io.fd; - set->pollfds[i_io].events = waiter->io.events; - set->io_waiters[i_io] = waiter; - i_io++; - } + i_io = 0; + i_time = 0; - /* time waiters: copy to time_waiters, calculate next expiry */ timerclear(&set->next_timeout); - for (i = i_time = 0; i < set->n_waiters; i++) { - struct waiter *waiter = set->waiters[i]; - - if (waiter->type != WAITER_TIME) - continue; - if (!timerisset(&set->next_timeout) || - timercmp(&waiter->timeout, - &set->next_timeout, <)) - set->next_timeout = waiter->timeout; + for (i = 0; i < set->n_waiters; i++) { + struct waiter *waiter = set->waiters[i]; - set->time_waiters[i_time] = waiter; - i_time++; + /* IO waiters: copy to io_waiters, populate pollfds */ + if (waiter->type == WAITER_IO) { + set->pollfds[i_io].fd = waiter->io.fd; + set->pollfds[i_io].events = waiter->io.events; + set->io_waiters[i_io] = waiter; + i_io++; + } + + /* time waiters: copy to time_waiters, calculate next expiry */ + if (waiter->type == WAITER_TIME) { + if (!timerisset(&set->next_timeout) || + timercmp(&waiter->timeout, + &set->next_timeout, <)) + set->next_timeout = waiter->timeout; + + set->time_waiters[i_time] = waiter; + i_time++; + } } } -- 2.39.2