diff options
| author |   jca <jca@openbsd.org> | 2019-05-01 19:14:25 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2019-05-01 19:14:25 +0000 |
| commit | 0b56c05694bfe553350a72e84d496f1189e881a0 (patch) | |
| tree | 1f7b3c477460ee0a6133f281a96de0c9cc8af8f1 | |
| parent | Require clock_gettime(CLOCK_MONOTONIC) and remove fallback code (diff) | |
| download | wireguard-openbsd-0b56c05694bfe553350a72e84d496f1189e881a0.tar.xz wireguard-openbsd-0b56c05694bfe553350a72e84d496f1189e881a0.zip | |
Tweaks previous: gettime() can be void, use TIMESPEC_TO_TIMEVAL
ok nicm@ tobias@ cheloha@
| -rw-r--r-- | lib/libevent/event.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/libevent/event.c b/lib/libevent/event.c index 97f9afe6aa4..078ae04b7c1 100644 --- a/lib/libevent/event.c +++ b/lib/libevent/event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: event.c,v 1.40 2019/05/01 19:12:47 jca Exp $ */ +/* $OpenBSD: event.c,v 1.41 2019/05/01 19:14:25 jca Exp $ */ /* * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> @@ -77,23 +77,20 @@ static void event_process_active(struct event_base *); static int timeout_next(struct event_base *, struct timeval **); static void timeout_process(struct event_base *); -static int +static void gettime(struct event_base *base, struct timeval *tp) { struct timespec ts; if (base->tv_cache.tv_sec) { *tp = base->tv_cache; - return (0); + return; } if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) event_err(1, "%s: clock_gettime", __func__); - tp->tv_sec = ts.tv_sec; - tp->tv_usec = ts.tv_nsec / 1000; - - return (0); + TIMESPEC_TO_TIMEVAL(tp, &ts); } struct event_base * @@ -803,8 +800,7 @@ timeout_next(struct event_base *base, struct timeval **tv_p) return (0); } - if (gettime(base, &now) == -1) - return (-1); + gettime(base, &now); if (timercmp(&ev->ev_timeout, &now, <=)) { timerclear(tv); |