# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1540747337 -3600
# Node ID 42eedef517dce11bedecf42a2e3773bf25b1fdf4
# Parent  44dbee2f173f052bde7253f7be9c6b7de9f31f30
net.server_epoll: Reschedule delayed timers relative to current time

This should normally never happen, but can be reproduced by suspending
the process a while.

diff -r 44dbee2f173f -r 42eedef517dc net/server_epoll.lua
--- a/net/server_epoll.lua	Sun Oct 28 17:17:07 2018 +0100
+++ b/net/server_epoll.lua	Sun Oct 28 18:22:17 2018 +0100
@@ -106,9 +106,13 @@
 		end
 		local new_timeout = f(now);
 		if new_timeout then
-			-- Schedule for 'delay' from the time actually scheduled,
-			-- not from now, in order to prevent timer drift.
-			timer[1] = t + new_timeout;
+			-- Schedule for 'delay' from the time actually scheduled, not from now,
+			-- in order to prevent timer drift, unless it already drifted way out of sync.
+			if (t + new_timeout) > ( now - new_timeout ) then
+				timer[1] = t + new_timeout;
+			else
+				timer[1] = now + new_timeout;
+			end
 			resort_timers = true;
 		else
 			t_remove(timers, i);