X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=36af33ef0854de3323c8f29c4dc522c976091764;hp=cddc3cacd266e5b80392d91af367d689da093bd6;hb=8cb4a3ed3d44fa4f85e176aaeaaf1da1d6eab5b6;hpb=4ba104904176bc059167757c10d461703b6b06dc diff --git a/ccan/io/poll.c b/ccan/io/poll.c index cddc3cac..36af33ef 100644 --- a/ccan/io/poll.c +++ b/ccan/io/poll.c @@ -16,11 +16,11 @@ static struct pollfd *pollfds = NULL; static struct fd **fds = NULL; static LIST_HEAD(closing); static LIST_HEAD(always); -static struct timeabs (*nowfn)(void) = time_now; +static struct timemono (*nowfn)(void) = time_mono; -struct timeabs (*io_time_override(struct timeabs (*now)(void)))(void) +struct timemono (*io_time_override(struct timemono (*now)(void)))(void) { - struct timeabs (*old)(void) = nowfn; + struct timemono (*old)(void) = nowfn; nowfn = now; return old; } @@ -262,7 +262,7 @@ void *io_loop(struct timers *timers, struct timer **expired) assert(num_waiting); if (timers) { - struct timeabs now, first; + struct timemono now, first; now = nowfn(); @@ -274,7 +274,7 @@ void *io_loop(struct timers *timers, struct timer **expired) /* Now figure out how long to wait for the next one. */ if (timer_earliest(timers, &first)) { uint64_t next; - next = time_to_msec(time_between(first, now)); + next = time_to_msec(timemono_between(first, now)); if (next < INT_MAX) ms_timeout = next; else