X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ftimer.lua;h=e3158d8beb37764b96a3011744b1091f1902a744;hb=5ef2d6d938a181d40ef444845f4ec3d136d9842d;hp=23bd6a37d592da8b47180d2645784841d7df18cc;hpb=abf7598066866a344358204d1a111dd087e19659;p=prosody.git

diff --git a/util/timer.lua b/util/timer.lua
index 23bd6a37..e3158d8b 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -9,81 +9,15 @@
 local indexedbheap = require "util.indexedbheap";
 local log = require "util.logger".init("timer");
 local server = require "net.server";
-local math_min = math.min
-local math_huge = math.huge
 local get_time = require "socket".gettime;
-local t_insert = table.insert;
-local pairs = pairs;
 local type = type;
 local debug_traceback = debug.traceback;
 local tostring = tostring;
 local xpcall = xpcall;
 
-local data = {};
-local new_data = {};
+local _ENV = nil;
 
-module "timer"
-
-local _add_task;
-if not server.event then
-	function _add_task(delay, callback)
-		local current_time = get_time();
-		delay = delay + current_time;
-		if delay >= current_time then
-			t_insert(new_data, {delay, callback});
-		else
-			local r = callback(current_time);
-			if r and type(r) == "number" then
-				return _add_task(r, callback);
-			end
-		end
-	end
-
-	server._addtimer(function()
-		local current_time = get_time();
-		if #new_data > 0 then
-			for _, d in pairs(new_data) do
-				t_insert(data, d);
-			end
-			new_data = {};
-		end
-
-		local next_time = math_huge;
-		for i, d in pairs(data) do
-			local t, callback = d[1], d[2];
-			if t <= current_time then
-				data[i] = nil;
-				local r = callback(current_time);
-				if type(r) == "number" then
-					_add_task(r, callback);
-					next_time = math_min(next_time, r);
-				end
-			else
-				next_time = math_min(next_time, t - current_time);
-			end
-		end
-		return next_time;
-	end);
-else
-	local event = server.event;
-	local event_base = server.event_base;
-	local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
-
-	function _add_task(delay, callback)
-		local event_handle;
-		event_handle = event_base:addevent(nil, 0, function ()
-			local ret = callback(get_time());
-			if ret then
-				return 0, ret;
-			elseif event_handle then
-				return EVENT_LEAVE;
-			end
-		end
-		, delay);
-	end
-end
-
---add_task = _add_task;
+local _add_task = server.add_task;
 
 local h = indexedbheap.create();
 local params = {};
@@ -113,7 +47,7 @@ local function _on_timer(now)
 		return peek - now;
 	end
 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;
 
@@ -125,11 +59,11 @@ function add_task(delay, callback, param)
 	end
 	return id;
 end
-function stop(id)
+local function stop(id)
 	params[id] = nil;
 	return h:remove(id);
 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);
@@ -140,4 +74,9 @@ function reschedule(id, delay)
 	return id;
 end
 
-return _M;
+return {
+	add_task = add_task;
+	stop = stop;
+	reschedule = reschedule;
+};
+