Merge 0.10->trunk

[prosody.git] / util / events.lua

diff --git a/util/events.lua b/util/events.lua
index e93d62045b37e6e664a9c96352d986b293f49816..e2943e4497f75bdda61b50ca11914e623864e6a6 100644 (file)
--- a/util/events.lua
+++ b/util/events.lua
@@ -9,17 +9,23 @@
 
 local pairs = pairs;
 local t_insert = table.insert;
+local t_remove = table.remove;
 local t_sort = table.sort;
 local setmetatable = setmetatable;
 local next = next;
 
-module "events"
+local _ENV = nil;
 
-function new()
+local function new()
+       -- Map event name to ordered list of handlers (lazily built): handlers[event_name] = array_of_handler_functions
        local handlers = {};
+       -- Array of wrapper functions that wrap all events (nil if empty)
        local global_wrappers;
+       -- Per-event wrappers: wrappers[event_name] = wrapper_function
        local wrappers = {};
+       -- Event map: event_map[handler_function] = priority_number
        local event_map = {};
+       -- Called on-demand to build handlers entries
        local function _rebuild_index(handlers, event)
                local _handlers = event_map[event];
                if not _handlers or next(_handlers) == nil then return; end
@@ -121,11 +127,11 @@ function new()
                if not w then return; end
                for i = #w, 1 do
                        if w[i] == wrapper then
-                               table.remove(w, i);
+                               t_remove(w, i);
                        end
                end
                if #w == 0 then
-                       if event_name == nil then
+                       if event_name == false then
                                global_wrappers = nil;
                        else
                                wrappers[event_name] = nil;
@@ -150,4 +156,6 @@ function new()
        };
 end
 
-return _M;
+return {
+       new = new;
+};