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: Prevent removed timers from being readded

Browse source 
In a case like this the timer would not be readded:

addtimer(1, function(t, id)
	stop(id)
	return 1
end);
This commit is contained in:
Kim Alvefur 2021-08-31 13:34:08 +02:00
parent 9eb707763c
commit 307e58cc75
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
net/server_epoll.lua
View file

@ -99,8 +99,14 @@ local fds = createtable(10, 0); -- FD -> conn
local timers = indexedbheap.create();
local function noop() end
-- Keep track of recently closed timers to avoid re-adding them
local closedtimers = {};
local function closetimer(id)
timers:remove(id);
if timers:remove(id) then
closedtimers[id] = true;
end
end
local function reschedule(id, time)
@ -138,7 +144,7 @@ local function runtimers(next_delay, min_wait)
local _, timer, id = timers:pop();
local ok, ret = xpcall(timer, traceback, now, id);
if ok and type(ret) == "number" then
if ok and type(ret) == "number" and not closedtimers[id] then
local next_time = elapsed+ret;
-- Delay insertion of timers to be re-added
-- so they don't get called again this tick
@ -161,6 +167,10 @@ local function runtimers(next_delay, min_wait)
peek = timers:peek();
end
if next(closedtimers) ~= nil then
closedtimers = {};
end
if peek == nil then
return next_delay;
else