X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fevents.lua;h=412acccd762cb755a9c0627f2689ea82b5989465;hb=f6ebcee8122a35d64b3546e9d58797f742827c17;hp=65b3b00b0e8c3be9511907b6ebab315903a2c305;hpb=e7826c42990ea5701f06789a2e8232ba26f938a5;p=prosody.git

diff --git a/util/events.lua b/util/events.lua
index 65b3b00b..412acccd 100644
--- a/util/events.lua
+++ b/util/events.lua
@@ -10,23 +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];
-		local index = handlers[event];
-		if index then
-			for i=#index,1,-1 do index[i] = nil; end
-		else index = {}; handlers[event] = index; end
+		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
@@ -35,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)
@@ -66,8 +72,8 @@ function new()
 	return {
 		add_handler = add_handler;
 		remove_handler = remove_handler;
-		add_plugin = add_plugin;
-		remove_plugin = remove_plugin;
+		add_handlers = add_handlers;
+		remove_handlers = remove_handlers;
 		fire_event = fire_event;
 		_handlers = handlers;
 		_event_map = event_map;