Merge 0.10->trunk

[prosody.git] / core / moduleapi.lua

diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 887ba858b33fe6b7fa935e1be7d3fb1623404517..d6aa0ef0f3d769ef566bf133b7ca7d0427bc7318 100644 (file)
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -7,19 +7,22 @@
 --
 
 local config = require "core.configmanager";
-local modulemanager = require "modulemanager"; -- This is necessary to avoid require loops
+local modulemanager; -- This gets set from modulemanager
 local array = require "util.array";
 local set = require "util.set";
 local logger = require "util.logger";
 local pluginloader = require "util.pluginloader";
 local timer = require "util.timer";
 local resolve_relative_path = require"util.paths".resolve_relative_path;
+local measure = require "core.statsmanager".measure;
 
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, type = error, setmetatable, type;
-local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
+local ipairs, pairs, select = ipairs, pairs, select;
 local tonumber, tostring = tonumber, tostring;
 local require = require;
+local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
+local unpack = table.unpack or unpack; -- renamed in 5.2
 
 local prosody = prosody;
 local hosts = prosody.hosts;
@@ -349,11 +352,29 @@ function api:send(stanza)
        return core_post_stanza(hosts[self.host], stanza);
 end
 
-function api:add_timer(delay, callback)
-       return timer.add_task(delay, function (t)
-               if self.loaded == false then return; end
-               return callback(t);
-       end);
+local timer_methods = { }
+local timer_mt = {
+       __index = timer_methods;
+}
+function timer_methods:stop( )
+       timer.stop(self.id);
+end
+timer_methods.disarm = timer_methods.stop
+function timer_methods:reschedule(delay)
+       timer.reschedule(self.id, delay)
+end
+
+local function timer_callback(now, id, t)
+       if t.module_env.loaded == false then return; end
+       return t.callback(now, unpack(t, 1, t.n));
+end
+
+function api:add_timer(delay, callback, ...)
+       local t = pack(...)
+       t.module_env = self;
+       t.callback = callback;
+       t.id = timer.add_task(delay, timer_callback, t);
+       return setmetatable(t, timer_mt);
 end
 
 local path_sep = package.config:sub(1,1);
@@ -370,4 +391,13 @@ function api:open_store(name, type)
        return require"core.storagemanager".open(self.host, name or self.name, type);
 end
 
+function api:measure(name, type)
+       return measure(type, "/"..self.host.."/mod_"..self.name.."/"..name);
+end
+
+function api.init(mm)
+       modulemanager = mm;
+       return api;
+end
+
 return api;