Change allocation of InspIRCd::Timers to be physically part of the object containing it

[user/henk/code/inspircd.git] / include / extensible.h

diff --git a/include/extensible.h b/include/extensible.h
index 40e820d680460ff52b4ba38f983890721f4d9065..0e1afdbdf5ff618f6983c414b5ecf6c3e07802bc 100644 (file)
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -17,6 +17,10 @@
  */
 
 
+#pragma once
+
+#include <stdint.h>
+
 enum SerializeFormat
 {
        /** Shown to a human (does not need to be unserializable) */
@@ -80,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)
@@ -90,13 +99,18 @@ 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
 {
        std::map<std::string, reference<ExtensionItem> > types;
  public:
-       void Register(ExtensionItem* item);
+       bool Register(ExtensionItem* item);
        void BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list);
        ExtensionItem* GetItem(const std::string& name);
 };
@@ -170,6 +184,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);
 };