X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ftimer.lua;h=af1e57b6d176c487b47c5e2d94e40c4eddb08247;hb=142cd12eac0f4b470a497f922fc65b3ead202e5a;hp=c6bd2748ec20ec0a3e40ac385c46daa8fe91662a;hpb=332edec7b662736cd8acac68ebdeeae6dc7a53c2;p=prosody.git diff --git a/util/timer.lua b/util/timer.lua index c6bd2748..af1e57b6 100644 --- a/util/timer.lua +++ b/util/timer.lua @@ -6,15 +6,12 @@ -- COPYING file in the source package for more information. -- - -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 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 t_remove = table.remove; -local ipairs, pairs = ipairs, pairs; +local pairs = pairs; local type = type; local data = {}; @@ -23,18 +20,21 @@ local new_data = {}; module "timer" local _add_task; -if not event then - function _add_task(delay, func) +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, func}); + t_insert(new_data, {delay, callback}); else - func(); + local r = callback(current_time); + if r and type(r) == "number" then + return _add_task(r, callback); + end end end - ns_addtimer(function() + server._addtimer(function() local current_time = get_time(); if #new_data > 0 then for _, d in pairs(new_data) do @@ -43,23 +43,34 @@ 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]; + local t, callback = 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 + 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, func) - event_base:addevent(nil, 0, function () - local ret = func(); + + 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; - else + elseif event_handle then return EVENT_LEAVE; end end