CLEANUP: poll: move the conditions for waiting out of the poll functions
The poll() functions have become a bit dirty because they now check the
size of the signal queue, the FD cache and the number of tasks. It's not
their job, this must be moved to the caller. In the end it simplifies the
code because the expiration date is now set to now_ms if we must not wait,
and this achieves in exactly the same result and is cleaner. The change
looks large due to the change of indent for blocks which were inside an
"if" block.
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index c52d075..ccb7c33 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -25,11 +25,8 @@
#include <types/global.h>
#include <proto/fd.h>
-#include <proto/signal.h>
-#include <proto/task.h>
-
/* private data */
static struct epoll_event *epoll_events;
static int epoll_fd;
@@ -112,25 +109,14 @@
fd_nbupdt = 0;
/* compute the epoll_wait() timeout */
-
- if (fd_cache_num || run_queue || signal_queue_len) {
- /* Maybe we still have events in the spec list, or there are
- * some tasks left pending in the run_queue, so we must not
- * wait in epoll() otherwise we would delay their delivery by
- * the next timeout.
- */
+ if (!exp)
+ wait_time = MAX_DELAY_MS;
+ else if (tick_is_expired(exp, now_ms))
wait_time = 0;
- }
else {
- if (!exp)
+ wait_time = TICKS_TO_MS(tick_remain(now_ms, exp)) + 1;
+ if (wait_time > MAX_DELAY_MS)
wait_time = MAX_DELAY_MS;
- else if (tick_is_expired(exp, now_ms))
- wait_time = 0;
- else {
- wait_time = TICKS_TO_MS(tick_remain(now_ms, exp)) + 1;
- if (wait_time > MAX_DELAY_MS)
- wait_time = MAX_DELAY_MS;
- }
}
/* now let's wait for polled events */