mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Many things: switch from hacky multi-arg xpcall implementations to a standard util.xpcall

Browse source
This commit is contained in:
Matthew Wild 2018-10-26 19:32:00 +01:00
parent 1454ac8208
commit f5f6460b2e
7 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
util/timer.lua
View file

@ -13,7 +13,7 @@ local get_time = require "util.time".now
local type = type;
local debug_traceback = debug.traceback;
local tostring = tostring;
local xpcall = xpcall;
local xpcall = require "util.xpcall".xpcall;
local math_max = math.max;
local _ENV = nil;
@ -26,24 +26,20 @@ local _active_timers = 0;
local h = indexedbheap.create();
local params = {};
local next_time = nil;
local _id, _callback, _now, _param;
local function _call() return _callback(_now, _id, _param); end
local function _traceback_handler(err) log("error", "Traceback[timer]: %s", debug_traceback(tostring(err), 2)); end
local function _on_timer(now)
local peek;
while true do
peek = h:peek();
if peek == nil or peek > now then break; end
local _;
_, _callback, _id = h:pop();
_now = now;
_param = params[_id];
params[_id] = nil;
--item(now, id, _param); -- FIXME pcall
local success, err = xpcall(_call, _traceback_handler);
local _, callback, id = h:pop();
local param = params[id];
params[id] = nil;
--item(now, id, _param);
local success, err = xpcall(callback, _traceback_handler, now, id, param);
if success and type(err) == "number" then
h:insert(_callback, err + now, _id); -- re-add
params[_id] = _param;
h:insert(callback, err + now, id); -- re-add
params[id] = param;
end
end