mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server_epoll: Ensure timers can't run more than once per tick

Browse source 
This makes sure that a timer that returns 0 (or less) does not prevent
runtimers() from completing, as well as making sure a timer added with
zero timeout from within a timer does not run until the next tick.

Thanks tmolitor
This commit is contained in:
Kim Alvefur 2021-01-08 21:57:19 +01:00
parent 7f7ec9e1ed
commit 861e5125c7
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
net/server_epoll.lua
View file

@ -97,10 +97,10 @@ local function runtimers(next_delay, min_wait)
-- Any timers at all?
local now = gettime();
local peek = timers:peek();
local readd;
while peek do
if peek > now then
next_delay = peek - now;
break;
end
@ -109,13 +109,29 @@ local function runtimers(next_delay, min_wait)
if ok and type(ret) == "number" then
local next_time = now+ret;
timer[1] = next_time;
timers:insert(timer, next_time);
-- Delay insertion of timers to be re-added
-- so they don't get called again this tick
if readd then
readd[id] = timer;
else
readd = { [id] = timer };
end
end
peek = timers:peek();
end
if readd then
for _, timer in pairs(readd) do
timers:insert(timer, timer[2]);
end
peek = timers:peek();
end
if peek == nil then
return next_delay;
else
next_delay = peek - now;
end
if next_delay < min_wait then