X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fevent.h;h=9fd43ccd2f4a7f580c0a9c5425117f5eccd4905b;hb=b271e0700a3fcedba73d540ae2eb27f5d3f67cdf;hp=1bcb0a5edaf17066d2f533a36d957ccfe663cdda;hpb=0e6b18ff9180fc7794cea53d0566411b9afb0d7e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/event.h b/include/event.h
index 1bcb0a5ed..9fd43ccd2 100644
--- a/include/event.h
+++ b/include/event.h
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2015, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -36,10 +37,15 @@ class Events::ModuleEventProvider : public ServiceProvider, private dynamic_refe
  public:
 	struct Comp
 	{
-		bool operator()(ModuleEventListener* one, ModuleEventListener* two) const;
+		bool operator()(ModuleEventListener* lhs, ModuleEventListener* rhs) const;
 	};
 
-	typedef insp::flat_multiset<ModuleEventListener*, Comp> SubscriberList;
+	struct ElementComp
+	{
+		bool operator()(ModuleEventListener* lhs, ModuleEventListener* rhs) const;
+	};
+
+	typedef insp::flat_multiset<ModuleEventListener*, Comp, ElementComp> SubscriberList;
 
 	/** Constructor
 	 * @param mod Module providing the event(s)
@@ -57,7 +63,23 @@ class Events::ModuleEventProvider : public ServiceProvider, private dynamic_refe
 	 */
 	const SubscriberList& GetSubscribers() const { return prov->subscribers; }
 
-	friend class ModuleEventListener;
+	/** Subscribes a listener to this event.
+	 * @param subscriber The listener to subscribe.
+	 */
+	void Subscribe(ModuleEventListener* subscriber)
+	{
+		subscribers.insert(subscriber);
+		OnSubscribe(subscriber);
+	}
+
+	/** Unsubscribes a listener from this event.
+	 * @param subscriber The listener to unsubscribe.
+	 */
+	void Unsubscribe(ModuleEventListener* subscriber)
+	{
+		subscribers.erase(subscriber);
+		OnUnsubscribe(subscriber);
+	}
 
  private:
 	void OnCapture() CXX11_OVERRIDE
@@ -67,6 +89,16 @@ class Events::ModuleEventProvider : public ServiceProvider, private dynamic_refe
 			subscribers.clear();
 	}
 
+	/** Called when a listener subscribes to this event.
+	 * @param subscriber The listener which subscribed.
+	 */
+	virtual void OnSubscribe(ModuleEventListener* subscriber) { }
+
+	/** Called when a listener unsubscribes from this event.
+	 * @param subscriber The listener which unsubscribed.
+	 */
+	virtual void OnUnsubscribe(ModuleEventListener* subscriber) { }
+
 	/** Reference to the active provider for this event. In case multiple event providers
 	 * exist for the same event, only one of them contains the list of subscribers.
 	 * To handle the case when we are not the ones with the list, we get it from the provider
@@ -95,7 +127,7 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
 	 */
 	void OnCapture() CXX11_OVERRIDE
 	{
-		prov->subscribers.insert(this);
+		prov->Subscribe(this);
 	}
 
  public:
@@ -119,15 +151,28 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
 	~ModuleEventListener()
 	{
 		if (prov)
-			prov->subscribers.erase(this);
+			prov->Unsubscribe(this);
 	}
 
-	friend struct ModuleEventProvider::Comp;
+	/** Retrieves the module which created this listener. */
+	const Module* GetModule() const { return prov.creator; }
+
+	/** Retrieves the priority of this event. */
+	unsigned int GetPriority() const { return eventpriority; }
 };
 
-inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventListener* one, Events::ModuleEventListener* two) const
+inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventListener* lhs, Events::ModuleEventListener* rhs) const
+{
+	return (lhs->GetPriority() < rhs->GetPriority());
+}
+
+inline bool Events::ModuleEventProvider::ElementComp::operator()(Events::ModuleEventListener* lhs, Events::ModuleEventListener* rhs) const
 {
-	return (one->eventpriority < two->eventpriority);
+	if (lhs->GetPriority() < rhs->GetPriority())
+		return true;
+	if (lhs->GetPriority() > rhs->GetPriority())
+		return false;
+	return std::less<ModuleEventListener*>()(lhs, rhs);
 }
 
 /**
@@ -140,7 +185,9 @@ inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventLis
 	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);
 
@@ -157,6 +204,9 @@ inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventLis
 	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; \