From 9b84e5e3b0d2fd29391618fb56367a4661732b60 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 26 Mar 2016 23:13:57 +0100 Subject: poll: fix epoll support --- cmake/config.cmake | 2 +- src/poll.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmake/config.cmake b/cmake/config.cmake index 9ddf5bf..049304f 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -12,7 +12,7 @@ endif() set(USE_BINDTODEVICE ${LINUX}) -set(USE_EPOLL FALSE) +set(USE_EPOLL ${LINUX}) set(USE_FREEBIND ${LINUX}) set(USE_PMTU ${LINUX}) set(USE_PKTINFO ${LINUX}) diff --git a/src/poll.c b/src/poll.c index cdb550a..a3326a7 100644 --- a/src/poll.c +++ b/src/poll.c @@ -164,14 +164,7 @@ bool fastd_poll_fd_close(fastd_poll_fd_t *fd) { void fastd_poll_handle(void) { - int maintenance_timeout = ctx.next_maintenance - ctx.now; - - if (maintenance_timeout < 0) - maintenance_timeout = 0; - - int timeout = handshake_timeout(); - if (timeout < 0 || timeout > maintenance_timeout) - timeout = maintenance_timeout; + int timeout = task_timeout(); struct epoll_event events[16]; int ret = epoll_wait_unblocked(ctx.epoll_fd, events, 16, timeout); -- cgit v1.2.3