Diff

net/server_epoll.lua @ 10984:69ed4764edda

net.server_epoll: Remove unused time field from timer objects Unused since the move to util.indexedbheap in c8c3f2eba898
author Kim Alvefur <zash@zash.se>
date Mon, 29 Jun 2020 20:13:12 +0200
parent 10983:0862325842ec
child 10985:758ce12586de
line wrap: on
line diff
--- a/net/server_epoll.lua	Mon Jun 29 17:13:05 2020 +0200
+++ b/net/server_epoll.lua	Mon Jun 29 20:13:12 2020 +0200
@@ -87,21 +87,19 @@
 
 local function noop() end
 local function closetimer(t)
-	t[1] = 0;
-	t[2] = noop;
+	t[1] = noop;
 	timers:remove(t.id);
 end
 
 local function reschedule(t, time)
 	time = monotonic() + time;
-	t[1] = time;
 	timers:reprioritize(t.id, time);
 end
 
 -- Add relative timer
 local function addtimer(timeout, f, param)
 	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);
 	return timer;
 end
@@ -121,10 +119,9 @@
 		end
 
 		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
 			local next_time = elapsed+ret;
-			timer[1] = next_time;
 			timers:insert(timer, next_time);
 		end