diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-01 01:45:52 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-01 01:45:52 +0400 |
commit | 7bc5360bba5ae057771200e2d5ae55c45f178c0d (patch) | |
tree | 0929ad64b228119c8f0bc7bda08fe5bb4c7f5907 /networking/isrv.c | |
parent | 05241802a7c7c4f85b69f34c5c13df88cdf9fb1e (diff) |
isrv: use monotonic_sec
runsv: do not use clock_gettime if !MONOTONIC_CLOCK
Diffstat (limited to 'networking/isrv.c')
-rw-r--r-- | networking/isrv.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/networking/isrv.c b/networking/isrv.c index 1a41dd4fb..080c60fbd 100644 --- a/networking/isrv.c +++ b/networking/isrv.c @@ -21,20 +21,6 @@ /* Helpers */ -/* Even if _POSIX_MONOTONIC_CLOCK is defined, this - * may require librt */ -#if 0 /*def _POSIX_MONOTONIC_CLOCK*/ -static time_t monotonic_time(void) -{ - struct timespec ts; - if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) - time(&ts.tv_sec); - return ts.tv_sec; -} -#else -#define monotonic_time() (time(NULL)) -#endif - /* Opaque structure */ struct isrv_state_t { @@ -258,7 +244,7 @@ static void handle_fd_set(isrv_state_t *state, fd_set *fds, int (*h)(int, void * /* this peer is gone */ remove_peer(state, peer); } else if (TIMEOUT) { - TIMEO_TBL[peer] = monotonic_time(); + TIMEO_TBL[peer] = monotonic_sec(); } } } @@ -335,7 +321,7 @@ void isrv_run( break; if (timeout) { - time_t t = monotonic_time(); + time_t t = monotonic_sec(); if (t != CURTIME) { CURTIME = t; handle_timeout(state, do_timeout); |