Scheduler: Fix timeout/watchdog interference bug

[senf.git] / senf / Scheduler / Poller.ct

diff --git a/senf/Scheduler/Poller.ct b/senf/Scheduler/Poller.ct
index 0cd1f07..bbe5c31 100644 (file)
--- a/senf/Scheduler/Poller.ct
+++ b/senf/Scheduler/Poller.ct
@@ -65,14 +65,12 @@ prefix_ typename senf::scheduler::detail::Poller<Value>::range senf::scheduler::
 {
     static epoll_event events[NumEvents];
     int rv (0);
-    for (;;) {
-        rv = epoll_wait(epollFd_, events, NumEvents, timeout_);
-        if (rv == -1) {
-            if (errno == EINTR)
-                continue;
+    rv = epoll_wait(epollFd_, events, NumEvents, timeout_);
+    if (rv == -1) {
+        if (errno == EINTR)
+            rv = 0;
+        else
             SENF_THROW_SYSTEM_EXCEPTION("epoll_wait()");
-        }
-        break;
     }
     return boost::make_iterator_range(
         boost::make_transform_iterator(events, GetPollResult()),