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

net.server_epoll: Remove unused time field from timer objects

Browse source 
Unused since the move to util.indexedbheap in c8c3f2eba898
This commit is contained in:
Kim Alvefur 2020-06-29 20:13:12 +02:00
parent ee10afcfab
commit 2b81c3b50f
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
net/server_epoll.lua
View file

@ -87,21 +87,19 @@ local timers = indexedbheap.create();
local function noop() end local function noop() end
local function closetimer(t) local function closetimer(t)
t[1] = 0; t[1] = noop;
t[2] = noop;
timers:remove(t.id); timers:remove(t.id);
end end
local function reschedule(t, time) local function reschedule(t, time)
time = monotonic() + time; time = monotonic() + time;
t[1] = time;
timers:reprioritize(t.id, time); timers:reprioritize(t.id, time);
end end
-- Add relative timer -- Add relative timer
local function addtimer(timeout, f, param) local function addtimer(timeout, f, param)
local time = monotonic() + timeout; local time = monotonic() + timeout;
local timer = { time, f, param, close = closetimer, reschedule = reschedule, id = nil }; local timer = { f, param, close = closetimer, reschedule = reschedule, id = nil };
timer.id = timers:insert(timer, time); timer.id = timers:insert(timer, time);
return timer; return timer;
end end
@ -121,10 +119,9 @@ local function runtimers(next_delay, min_wait)
end end
local _, timer = timers:pop(); local _, timer = timers:pop();
local ok, ret = pcall(timer[2], now, timer, timer[3]); local ok, ret = pcall(timer[1], now, timer, timer[2]);
if ok and type(ret) == "number" then if ok and type(ret) == "number" then
local next_time = elapsed+ret; local next_time = elapsed+ret;
timer[1] = next_time;
timers:insert(timer, next_time); timers:insert(timer, next_time);
end end