X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fevents.lua;h=40ca39131240c2f9c906021e3fe5a6886361a01d;hb=95dfe4b0aaaf26ee4651c09eb9757c56210a135a;hp=81bea639d5ff46549e369c78cd05f8504c330258;hpb=1fa7311ce422aff109042edbe8f8729472000511;p=prosody.git

diff --git a/util/events.lua b/util/events.lua
index 81bea639..40ca3913 100644
--- a/util/events.lua
+++ b/util/events.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -10,21 +10,26 @@
 local pairs = pairs;
 local t_insert = table.insert;
 local t_sort = table.sort;
+local setmetatable = setmetatable;
+local next = next;
 
 module "events"
 
 function new()
 	local handlers = {};
 	local event_map = {};
-	local function _rebuild_index(event) -- TODO optimize index rebuilding
+	local function _rebuild_index(handlers, event)
 		local _handlers = event_map[event];
+		if not _handlers or next(_handlers) == nil then return; end
 		local index = {};
 		for handler in pairs(_handlers) do
 			t_insert(index, handler);
 		end
 		t_sort(index, function(a, b) return _handlers[a] > _handlers[b]; end);
 		handlers[event] = index;
+		return index;
 	end;
+	setmetatable(handlers, { __index = _rebuild_index });
 	local function add_handler(event, handler, priority)
 		local map = event_map[event];
 		if map then
@@ -33,13 +38,16 @@ function new()
 			map = {[handler] = priority or 0};
 			event_map[event] = map;
 		end
-		_rebuild_index(event);
+		handlers[event] = nil;
 	end;
 	local function remove_handler(event, handler)
 		local map = event_map[event];
 		if map then
 			map[handler] = nil;
-			_rebuild_index(event);
+			handlers[event] = nil;
+			if next(map) == nil then
+				event_map[event] = nil;
+			end
 		end
 	end;
 	local function add_handlers(handlers)
@@ -52,11 +60,11 @@ function new()
 			remove_handler(event, handler);
 		end
 	end;
-	local function fire_event(event, ...)
-		local h = handlers[event];
+	local function fire_event(event_name, event_data)
+		local h = handlers[event_name];
 		if h then
 			for i=1,#h do
-				local ret = h[i](...);
+				local ret = h[i](event_data);
 				if ret ~= nil then return ret; end
 			end
 		end