X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fevents.lua;h=412acccd762cb755a9c0627f2689ea82b5989465;hb=0ef23c673d1d620c9c1cc3e8aed43add63634426;hp=ef8fc30ab5bab24300851a8269a10682c05b97a0;hpb=332ebda71d7fa4771a8222664b3b8bf341109432;p=prosody.git

diff --git a/util/events.lua b/util/events.lua
index ef8fc30a..412acccd 100644
--- a/util/events.lua
+++ b/util/events.lua
@@ -1,35 +1,35 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
 --
 
 
-local ipairs = ipairs;
 local pairs = pairs;
 local t_insert = table.insert;
 local t_sort = table.sort;
-local select = select;
+local setmetatable = setmetatable;
+local next = next;
 
 module "events"
 
 function new()
-	local dispatchers = {};
 	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
@@ -38,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)
@@ -57,22 +60,7 @@ function new()
 			remove_handler(event, handler);
 		end
 	end;
-	local function _create_dispatcher(event) -- FIXME duplicate code in fire_event
-		local h = handlers[event];
-		if not h then h = {}; handlers[event] = h; end
-		local dispatcher = function(...)
-			for i=1,#h do
-				local ret = h[i](...);
-				if ret ~= nil then return ret; end
-			end
-		end;
-		dispatchers[event] = dispatcher;
-		return dispatcher;
-	end;
-	local function get_dispatcher(event)
-		return dispatchers[event] or _create_dispatcher(event);
-	end;
-	local function fire_event(event, ...) -- FIXME duplicates dispatcher code
+	local function fire_event(event, ...)
 		local h = handlers[event];
 		if h then
 			for i=1,#h do
@@ -81,24 +69,12 @@ function new()
 			end
 		end
 	end;
-	local function get_named_arg_dispatcher(event, ...)
-		local dispatcher = get_dispatcher(event);
-		local keys = {...};
-		local data = {};
-		return function(...)
-			for i, key in ipairs(keys) do data[key] = select(i, ...); end
-			dispatcher(data);
-		end;
-	end;
 	return {
 		add_handler = add_handler;
 		remove_handler = remove_handler;
-		add_plugin = add_plugin;
-		remove_plugin = remove_plugin;
-		get_dispatcher = get_dispatcher;
+		add_handlers = add_handlers;
+		remove_handlers = remove_handlers;
 		fire_event = fire_event;
-		get_named_arg_dispatcher = get_named_arg_dispatcher;
-		_dispatchers = dispatchers;
 		_handlers = handlers;
 		_event_map = event_map;
 	};