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/haproxy.c b/src/haproxy.c
index b2f3e36..752c4a2 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1486,6 +1486,10 @@
if (jobs == 0)
break;
+ /* expire immediately if events are pending */
+ if (fd_cache_num || run_queue || signal_queue_len)
+ next = now_ms;
+
/* The poller will ensure it returns around <next> */
cur_poller.poll(&cur_poller, next);
fd_process_cached_events();