X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ftimer.lua;h=3061da725384ce6d7a0a3d3e7462441e71ef1692;hb=492c253d150aeb7edb6687eb9bf085be6c33133a;hp=efc1812d3126fccf01b9719967346b77a93d685e;hpb=f7a657b41522de421b2ba84546188ecb390e57f5;p=prosody.git

diff --git a/util/timer.lua b/util/timer.lua
index efc1812d..3061da72 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -11,7 +11,9 @@ local ns_addtimer = require "net.server".addtimer;
 local event = require "net.server".event;
 local event_base = require "net.server".event_base;
 
-local get_time = os.time;
+local math_min = math.min
+local math_huge = math.huge
+local get_time = require "socket".gettime;
 local t_insert = table.insert;
 local t_remove = table.remove;
 local ipairs, pairs = ipairs, pairs;
@@ -43,23 +45,31 @@ if not event then
 			new_data = {};
 		end
 		
+		local next_time = math_huge;
 		for i, d in pairs(data) do
 			local t, func = d[1], d[2];
 			if t <= current_time then
 				data[i] = nil;
 				local r = func(current_time);
-				if type(r) == "number" then _add_task(r, func); end
+				if type(r) == "number" then
+					_add_task(r, func);
+					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_LEAVE = (event.core and event.core.LEAVE) or -1;
 	function _add_task(delay, func)
-		event_base:addevent(nil, event.EV_TIMEOUT, function ()
+		local event_handle;
+		event_handle = event_base:addevent(nil, 0, function ()
 			local ret = func();
 			if ret then
-				_add_task(ret, func);
-			else
+				return 0, ret;
+			elseif event_handle then
 				return EVENT_LEAVE;
 			end
 		end