Update time for ioset backend.

src/ioset-epoll.c (ioset_epoll_loop): Set now after epoll_wait() returns.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-51

diff --git a/ChangeLog b/ChangeLog
index 29773f535bb2159fc2214388472434e73192910a..16645a000adc1a1d5ae1dce0dc739ca69d5c585f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2006/srvx--devo--1.3
 #
 
+2006-10-04 01:23:10 GMT        Michael Poole <mdpoole@troilus.org>     patch-51
+
+    Summary:
+      Update time for ioset backend.
+    Revision:
+      srvx--devo--1.3--patch-51
+
+    src/ioset-epoll.c (ioset_epoll_loop): Set now after epoll_wait() returns.
+
+    modified files:
+     ChangeLog src/ioset-epoll.c
+
+
 2006-10-03 23:18:25 GMT        Michael Poole <mdpoole@troilus.org>     patch-50
 
     Summary:

diff --git a/src/ioset-epoll.c b/src/ioset-epoll.c
index e09f83fa6b3049836c6d57a10d826b4ee4a0aac5..4e0589c364a705c288381d7add8aacd49ff173b6 100644 (file)
--- a/src/ioset-epoll.c
+++ b/src/ioset-epoll.c
@@ -102,6 +102,7 @@ ioset_epoll_loop(struct timeval *timeout)
     msec = timeout ? (timeout->tv_sec * 1000 + timeout->tv_usec / 1000) : -1;
 
     res = epoll_wait(epoll_fd, evts, ArrayLength(evts), msec);
+    now = time(NULL) + clock_skew;
     if (res < 0) {
         if (errno != EINTR) {
             log_module(MAIN_LOG, LOG_ERROR, "epoll_wait() error %d: %s", errno, strerror(errno));