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

diff --git a/include/extensible.h b/include/extensible.h
index 449c7b38a..86e0d6b07 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -1,5 +1,25 @@
-class Extensible;
-class Module;
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include <stdint.h>
 
 enum SerializeFormat
 {
@@ -15,11 +35,9 @@ enum SerializeFormat
 
 /** Class represnting an extension of some object
  */
-class CoreExport ExtensionItem
+class CoreExport ExtensionItem : public ServiceProvider, public usecountbase
 {
  public:
-	const std::string key;
-	Module* const owner;
 	ExtensionItem(const std::string& key, Module* owner);
 	virtual ~ExtensionItem();
 	/** Serialize this item into a string
@@ -57,7 +75,7 @@ class CoreExport ExtensionItem
 class CoreExport Extensible : public classbase
 {
  public:
-	typedef std::map<ExtensionItem*,void*> ExtensibleStore;
+	typedef insp::flat_map<reference<ExtensionItem>, void*> ExtensibleStore;
 
 	// Friend access for the protected getter/setter
 	friend class ExtensionItem;
@@ -66,23 +84,34 @@ 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)
 	 */
 	inline const ExtensibleStore& GetExtList() const { return extensions; }
 
+	Extensible();
 	virtual CullResult cull();
 	virtual ~Extensible();
-	void doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove);
+	void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
+
+	/**
+	 * Free all extension items attached to this Extensible
+	 */
+	void FreeAllExtItems();
 };
 
 class CoreExport ExtensionManager
 {
-	std::map<std::string, ExtensionItem*> types;
+	std::map<std::string, reference<ExtensionItem> > types;
  public:
-	void Register(ExtensionItem* item);
-	void BeginUnregister(Module* module, std::vector<ExtensionItem*>& list);
+	bool Register(ExtensionItem* item);
+	void BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list);
 	ExtensionItem* GetItem(const std::string& name);
 };
 
@@ -97,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:
@@ -118,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));
 	}
 };
 
@@ -155,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);
 };