X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ftimer.lua;h=2277ee77b5025707cb0ce199a3071fa88b7f53bd;hb=2b120230b5ec5bcd129344ae908e73b89867d600;hp=0ec9758588560885364696fa4089a2a56fc1f013;hpb=52de3bed26f3c79620cbdef4381b3bf935e305e6;p=prosody.git

diff --git a/util/timer.lua b/util/timer.lua
index 0ec97585..2277ee77 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -15,11 +15,12 @@ local debug_traceback = debug.traceback;
 local tostring = tostring;
 local xpcall = xpcall;
 
-module "timer"
+local _ENV = nil;
 
 local _add_task = server.add_task;
---add_task = _add_task;
 
+local _server_timer;
+local _active_timers = 0;
 local h = indexedbheap.create();
 local params = {};
 local next_time = nil;
@@ -43,12 +44,22 @@ local function _on_timer(now)
 			params[_id] = _param;
 		end
 	end
-	next_time = peek;
-	if peek ~= nil then
+
+	if peek ~= nil and _active_timers > 1 and peek == next_time then
+		-- Another instance of _on_timer already set next_time to the same value,
+		-- so it should be safe to not renew this timer event
+		peek = nil;
+	else
+		next_time = peek;
+	end
+
+	if peek then
+		-- peek is the time of the next event
 		return peek - now;
 	end
+	_active_timers = _active_timers - 1;
 end
-function add_task(delay, callback, param)
+local function add_task(delay, callback, param)
 	local current_time = get_time();
 	local event_time = current_time + delay;
 
@@ -56,15 +67,30 @@ function add_task(delay, callback, param)
 	params[id] = param;
 	if next_time == nil or event_time < next_time then
 		next_time = event_time;
-		_add_task(next_time - current_time, _on_timer);
+		if _server_timer then
+			_server_timer:close();
+			_server_timer = nil;
+		else
+			_active_timers = _active_timers + 1;
+		end
+		_server_timer = _add_task(next_time - current_time, _on_timer);
 	end
 	return id;
 end
-function stop(id)
+local function stop(id)
 	params[id] = nil;
-	return h:remove(id);
+	local result, item, result_sync = h:remove(id);
+	local peek = h:peek();
+	if peek ~= next_time and _server_timer then
+		next_time = peek;
+		_server_timer:close();
+		if next_time ~= nil then
+			_server_timer = _add_task(next_time - get_time(), _on_timer);
+		end
+	end
+	return result, item, result_sync;
 end
-function reschedule(id, delay)
+local function reschedule(id, delay)
 	local current_time = get_time();
 	local event_time = current_time + delay;
 	h:reprioritize(id, delay);
@@ -75,4 +101,9 @@ function reschedule(id, delay)
 	return id;
 end
 
-return _M;
+return {
+	add_task = add_task;
+	stop = stop;
+	reschedule = reschedule;
+};
+