Make classbase and refcountbase uncopyable; expand comments on their indended uses

[user/henk/code/inspircd.git] / src / base.cpp

diff --git a/src/base.cpp b/src/base.cpp
index 1e4f746af3dd5cb7ac8f04c66060ecf860291acf..2e2dbfb287d365c78e3022e8c5c5089dca02884d 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -18,74 +18,43 @@
 #include <time.h>
 #include "inspircd.h"
 
-const int bitfields[]           =       {1,2,4,8,16,32,64,128};
-const int inverted_bitfields[]  =       {~1,~2,~4,~8,~16,~32,~64,~128};
-std::map<std::string, ExtensionItem*> Extensible::extension_types;
-
 classbase::classbase()
 {
 }
 
-void BoolSet::Set(int number)
-{
-       this->bits |= bitfields[number];
-}
-
-void BoolSet::Unset(int number)
+CullResult classbase::cull()
 {
-       this->bits &= inverted_bitfields[number];
+       return CullResult();
 }
 
-void BoolSet::Invert(int number)
+classbase::~classbase()
 {
-       this->bits ^= bitfields[number];
 }
 
-bool BoolSet::Get(int number)
+CullResult::CullResult()
 {
-       return ((this->bits | bitfields[number]) > 0);
 }
 
-bool BoolSet::operator==(BoolSet other)
+refcountbase::refcountbase() : refcount(0)
 {
-       return (this->bits == other.bits);
 }
 
-BoolSet BoolSet::operator|(BoolSet other)
+refcountbase::~refcountbase()
 {
-       BoolSet x(this->bits | other.bits);
-       return x;
 }
 
-BoolSet BoolSet::operator&(BoolSet other)
-{
-       BoolSet x(this->bits & other.bits);
-       return x;
-}
-
-BoolSet::BoolSet()
-{
-       this->bits = 0;
-}
-
-BoolSet::BoolSet(char bitmask)
-{
-       this->bits = bitmask;
-}
-
-bool BoolSet::operator=(BoolSet other)
+ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : key(Key), owner(mod)
 {
-       this->bits = other.bits;
-       return true;
 }
 
-ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : key(Key), owner(mod)
+ExtensionItem::~ExtensionItem()
 {
 }
 
-void* ExtensionItem::get_raw(const Extensible* container)
+void* ExtensionItem::get_raw(const Extensible* container) const
 {
-       ExtensibleStore::const_iterator i = container->extensions.find(key);
+       Extensible::ExtensibleStore::const_iterator i =
+               container->extensions.find(const_cast<ExtensionItem*>(this));
        if (i == container->extensions.end())
                return NULL;
        return i->second;
@@ -93,8 +62,8 @@ void* ExtensionItem::get_raw(const Extensible* container)
 
 void* ExtensionItem::set_raw(Extensible* container, void* value)
 {
-       std::pair<ExtensibleStore::iterator,bool> rv = 
-               container->extensions.insert(std::make_pair(key, value));
+       std::pair<Extensible::ExtensibleStore::iterator,bool> rv =
+               container->extensions.insert(std::make_pair(this, value));
        if (rv.second)
        {
                return NULL;
@@ -109,7 +78,7 @@ void* ExtensionItem::set_raw(Extensible* container, void* value)
 
 void* ExtensionItem::unset_raw(Extensible* container)
 {
-       ExtensibleStore::iterator i = container->extensions.find(key);
+       Extensible::ExtensibleStore::iterator i = container->extensions.find(this);
        if (i == container->extensions.end())
                return NULL;
        void* rv = i->second;
@@ -117,37 +86,70 @@ void* ExtensionItem::unset_raw(Extensible* container)
        return rv;
 }
 
-bool Extensible::Register(ExtensionItem* item)
+void ExtensionManager::Register(ExtensionItem* item)
 {
-       return Extensible::extension_types.insert(std::make_pair(item->key, item)).second;
+       types.insert(std::make_pair(item->key, item));
 }
 
-void Extensible::UnRegister(Module* module)
+void ExtensionManager::BeginUnregister(Module* module, std::vector<ExtensionItem*>& list)
 {
-       ExtensibleTypes::iterator i = extension_types.begin();
-       while (i != extension_types.end())
+       std::map<std::string, ExtensionItem*>::iterator i = types.begin();
+       while (i != types.end())
        {
-               ExtensibleTypes::iterator c = i++;
-               if (c->second->owner == module)
-                       extension_types.erase(c);
+               std::map<std::string, ExtensionItem*>::iterator me = i++;
+               ExtensionItem* item = me->second;
+               if (item->owner == module)
+               {
+                       list.push_back(item);
+                       types.erase(me);
+               }
        }
 }
 
-Extensible::~Extensible()
+ExtensionItem* ExtensionManager::GetItem(const std::string& name)
+{
+       std::map<std::string, ExtensionItem*>::iterator i = types.find(name);
+       if (i == types.end())
+               return NULL;
+       return i->second;
+}
+
+void Extensible::doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove)
+{
+       for(std::vector<ExtensionItem*>::const_iterator i = toRemove.begin(); i != toRemove.end(); ++i)
+       {
+               ExtensionItem* item = *i;
+               ExtensibleStore::iterator e = extensions.find(item);
+               if (e != extensions.end())
+               {
+                       item->free(e->second);
+                       extensions.erase(e);
+               }
+       }
+}
+
+CullResult Extensible::cull()
 {
        for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
        {
-               ExtensionItem* type = extension_types[i->first];
-               if (type)
-                       type->free(i->second);  
+               i->first->free(i->second);      
        }
+       return classbase::cull();
+}
+
+Extensible::~Extensible()
+{
 }
 
 LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)
 {
 }
 
-std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item)
+LocalExtItem::~LocalExtItem()
+{
+}
+
+std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
 {
        return "";
 }
@@ -159,7 +161,11 @@ void LocalExtItem::unserialize(SerializeFormat format, Extensible* container, co
 LocalStringExt::LocalStringExt(const std::string& Key, Module* Owner)
        : SimpleExtItem<std::string>(Key, Owner) { }
 
-std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item)
+LocalStringExt::~LocalStringExt()
+{
+}
+
+std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
 {
        if (item && format == FORMAT_USER)
                return *static_cast<std::string*>(item);
@@ -170,14 +176,18 @@ LocalIntExt::LocalIntExt(const std::string& Key, Module* mod) : LocalExtItem(Key
 {
 }
 
-std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item)
+LocalIntExt::~LocalIntExt()
+{
+}
+
+std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
 {
        if (format != FORMAT_USER)
                return "";
        return ConvToStr(reinterpret_cast<intptr_t>(item));
 }
 
-intptr_t LocalIntExt::get(const Extensible* container)
+intptr_t LocalIntExt::get(const Extensible* container) const
 {
        return reinterpret_cast<intptr_t>(get_raw(container));
 }
@@ -198,12 +208,16 @@ StringExtItem::StringExtItem(const std::string& Key, Module* mod) : ExtensionIte
 {
 }
 
-std::string* StringExtItem::get(const Extensible* container)
+StringExtItem::~StringExtItem()
+{
+}
+
+std::string* StringExtItem::get(const Extensible* container) const
 {
        return static_cast<std::string*>(get_raw(container));
 }
 
-std::string StringExtItem::serialize(SerializeFormat format, const Extensible* container, void* item)
+std::string StringExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
 {
        return item ? *static_cast<std::string*>(item) : "";
 }