aboutsummaryrefslogtreecommitdiffstats
path: root/util/timer.lua
diff options
context:
space:
mode:
Diffstat (limited to 'util/timer.lua')
-rw-r--r--util/timer.lua16
1 files changed, 7 insertions, 9 deletions
diff --git a/util/timer.lua b/util/timer.lua
index d5b66473..e52a6917 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -6,17 +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 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 = {};
@@ -25,7 +20,7 @@ local new_data = {};
module "timer"
local _add_task;
-if not event then
+if not server.event then
function _add_task(delay, callback)
local current_time = get_time();
delay = delay + current_time;
@@ -39,7 +34,7 @@ if not event then
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
@@ -65,7 +60,10 @@ if not event then
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 ()