X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fevent.h;h=b00e44e3847cc04b9526703a6345d0f3b5720bdd;hb=87bbf574bde2149daed9f9967f33ceae13250b70;hp=c9bad7d045f81423bb3d24f030fe3f72e46e59c2;hpb=8ff409cb9a393559ebda3990ab2926c9a42d87a1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/event.h b/include/event.h
index c9bad7d04..b00e44e38 100644
--- a/include/event.h
+++ b/include/event.h
@@ -34,7 +34,12 @@ namespace Events
 class Events::ModuleEventProvider : public ServiceProvider, private dynamic_reference_base::CaptureHook
 {
  public:
-	typedef std::vector<ModuleEventListener*> SubscriberList;
+	struct Comp
+	{
+		bool operator()(ModuleEventListener* one, ModuleEventListener* two) const;
+	};
+
+	typedef insp::flat_multiset<ModuleEventListener*, Comp, std::less<ModuleEventListener*> > SubscriberList;
 
 	/** Constructor
 	 * @param mod Module providing the event(s)
@@ -84,20 +89,26 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
 	 */
 	dynamic_reference_nocheck<ModuleEventProvider> prov;
 
+	const unsigned int eventpriority;
+
 	/** Called by the dynref when the event provider becomes available
 	 */
 	void OnCapture() CXX11_OVERRIDE
 	{
-		prov->subscribers.push_back(this);
+		prov->subscribers.insert(this);
 	}
 
  public:
+	static const unsigned int DefaultPriority = 100;
+
 	/** Constructor
 	 * @param mod Module subscribing
 	 * @param eventid Identifier of the event to subscribe to
+	 * @param eventprio The priority to give this event listener
 	 */
-	ModuleEventListener(Module* mod, const std::string& eventid)
+	ModuleEventListener(Module* mod, const std::string& eventid, unsigned int eventprio = DefaultPriority)
 		: prov(mod, eventid)
+		, eventpriority(eventprio)
 	{
 		prov.SetCaptureHook(this);
 		// If the dynamic_reference resolved at construction our capture handler wasn't called
@@ -108,21 +119,33 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
 	~ModuleEventListener()
 	{
 		if (prov)
-			stdalgo::erase(prov->subscribers, this);
+			prov->subscribers.erase(this);
 	}
+
+	/** Retrieves the module which created this listener. */
+	const Module* GetModule() const { return prov.creator; }
+
+	friend struct ModuleEventProvider::Comp;
 };
 
+inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventListener* one, Events::ModuleEventListener* two) const
+{
+	return (one->eventpriority < two->eventpriority);
+}
+
 /**
  * Run the given hook provided by a module
  *
  * FOREACH_MOD_CUSTOM(accountevprov, AccountEventListener, OnAccountChange, MOD_RESULT, (user, newaccount))
  */
 #define FOREACH_MOD_CUSTOM(prov, listenerclass, func, params) do { \
-	const Events::ModuleEventProvider::SubscriberList& _handlers = (prov).GetSubscribers(); \
-	for (Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
+	const ::Events::ModuleEventProvider::SubscriberList& _handlers = (prov).GetSubscribers(); \
+	for (::Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
 	{ \
 		listenerclass* _t = static_cast<listenerclass*>(*_i); \
-		_t->func params ; \
+		const Module* _m = _t->GetModule(); \
+		if (_m && !_m->dying) \
+			_t->func params ; \
 	} \
 } while (0);
 
@@ -135,10 +158,13 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
  */
 #define FIRST_MOD_RESULT_CUSTOM(prov, listenerclass, func, result, params) do { \
 	result = MOD_RES_PASSTHRU; \
-	const Events::ModuleEventProvider::SubscriberList& _handlers = (prov).GetSubscribers(); \
-	for (Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
+	const ::Events::ModuleEventProvider::SubscriberList& _handlers = (prov).GetSubscribers(); \
+	for (::Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
 	{ \
 		listenerclass* _t = static_cast<listenerclass*>(*_i); \
+		const Module* _m = _t->GetModule(); \
+		if (!_m || _m->dying) \
+			continue; \
 		result = _t->func params ; \
 		if (result != MOD_RES_PASSTHRU) \
 			break; \