X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fextensible.h;h=86e0d6b07fe2bbc8af02c65be4080890ca84fa95;hb=5be578ce5e84c3d71bf2a1ac97fe6793bb124177;hp=e062f66a5131aab399d72a6fb219e4370fdb7524;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/extensible.h b/include/extensible.h
index e062f66a5..86e0d6b07 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -75,7 +75,7 @@ class CoreExport ExtensionItem : public ServiceProvider, public usecountbase
 class CoreExport Extensible : public classbase
 {
  public:
-	typedef std::map<reference<ExtensionItem>,void*> ExtensibleStore;
+	typedef insp::flat_map<reference<ExtensionItem>, void*> ExtensibleStore;
 
 	// Friend access for the protected getter/setter
 	friend class ExtensionItem;
@@ -84,6 +84,11 @@ class CoreExport Extensible : public classbase
 	 * Holds all extensible metadata for the class.
 	 */
 	ExtensibleStore extensions;
+
+	/** True if this Extensible has been culled.
+	 * A warning is generated if false on destruction.
+	 */
+	unsigned int culled:1;
  public:
 	/**
 	 * Get the extension items for iteraton (i.e. for metadata sync during netburst)
@@ -94,6 +99,11 @@ class CoreExport Extensible : public classbase
 	virtual CullResult cull();
 	virtual ~Extensible();
 	void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
+
+	/**
+	 * Free all extension items attached to this Extensible
+	 */
+	void FreeAllExtItems();
 };
 
 class CoreExport ExtensionManager
@@ -116,7 +126,7 @@ class CoreExport LocalExtItem : public ExtensionItem
 	virtual void free(void* item) = 0;
 };
 
-template<typename T>
+template <typename T, typename Del = stdalgo::defaultdeleter<T> >
 class SimpleExtItem : public LocalExtItem
 {
  public:
@@ -137,24 +147,28 @@ class SimpleExtItem : public LocalExtItem
 	{
 		T* ptr = new T(value);
 		T* old = static_cast<T*>(set_raw(container, ptr));
-		delete old;
+		Del del;
+		del(old);
 	}
 
 	inline void set(Extensible* container, T* value)
 	{
 		T* old = static_cast<T*>(set_raw(container, value));
-		delete old;
+		Del del;
+		del(old);
 	}
 
 	inline void unset(Extensible* container)
 	{
 		T* old = static_cast<T*>(unset_raw(container));
-		delete old;
+		Del del;
+		del(old);
 	}
 
 	virtual void free(void* item)
 	{
-		delete static_cast<T*>(item);
+		Del del;
+		del(static_cast<T*>(item));
 	}
 };
 
@@ -174,6 +188,7 @@ class CoreExport LocalIntExt : public LocalExtItem
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
 	intptr_t get(const Extensible* container) const;
 	intptr_t set(Extensible* container, intptr_t value);
+	void unset(Extensible* container) { set(container, 0); }
 	void free(void* item);
 };