Currently we only check timer expiry if there are no client fd (or
other input) waiting to be serviced. This makes it very easy to starve
the timers with long request queues, and so miss critical timestamps.

The timer subsystem is just another input waiting to be serviced, so
evaluate it on every loop like all the others, at the cost of calling
GetTimeInMillis() slightly more frequently. (A more invasive and likely
OS specific alternative would be to move the timer wheel to the local
equivalent of timerfd, and treat it as an input fd to the event loop
exactly equivalent to all the others, and so also serviced on every
pass. The trade-off being that the kernel timer wheel is likely more
efficiently integrated with epoll, but individual updates to each timer
would then require syscalls.)

Signed-off-by: Chris Wilson <>
 os/WaitFor.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/os/WaitFor.c b/os/WaitFor.c
index fa6a99b18..7c7b1d2d4 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -193,10 +193,9 @@ WaitForSomething(Bool are_ready)
             are_ready = clients_are_ready();
+        timeout = check_timers();
         if (are_ready)
             timeout = 0;
-        else
-            timeout = check_timers();
         if (NewOutputPending)

_______________________________________________ X.Org development

Reply via email to