X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=59196fec1d6242fb1ca1a3f6ffad4cacd915517f;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=4d0c170776d9c7b4d1bfe47fd7878c669b71214c;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index 4d0c17077..59196fec1 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -11,81 +11,58 @@ * --------------------------------------------------- */ -/* $Core */ - #include "inspircd_config.h" #include "base.h" #include #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 Extensible::extension_types; +#include classbase::classbase() { + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::+%s @%p", + typeid(*this).name(), (void*)this); } -void BoolSet::Set(int number) -{ - this->bits |= bitfields[number]; -} - -void BoolSet::Unset(int number) -{ - this->bits &= inverted_bitfields[number]; -} - -void BoolSet::Invert(int number) -{ - this->bits ^= bitfields[number]; -} - -bool BoolSet::Get(int number) -{ - return ((this->bits | bitfields[number]) > 0); -} - -bool BoolSet::operator==(BoolSet other) +CullResult classbase::cull() { - return (this->bits == other.bits); + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::-%s @%p", + typeid(*this).name(), (void*)this); + return CullResult(); } -BoolSet BoolSet::operator|(BoolSet other) +classbase::~classbase() { - BoolSet x(this->bits | other.bits); - return x; + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::~%s @%p", + typeid(*this).name(), (void*)this); } -BoolSet BoolSet::operator&(BoolSet other) +CullResult::CullResult() { - BoolSet x(this->bits & other.bits); - return x; } -BoolSet::BoolSet() +refcountbase::refcountbase() : refcount(0) { - this->bits = 0; } -BoolSet::BoolSet(char bitmask) +refcountbase::~refcountbase() { - 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(this)); if (i == container->extensions.end()) return NULL; return i->second; @@ -93,8 +70,8 @@ void* ExtensionItem::get_raw(const Extensible* container) void* ExtensionItem::set_raw(Extensible* container, void* value) { - std::pair rv = - container->extensions.insert(std::make_pair(key, value)); + std::pair rv = + container->extensions.insert(std::make_pair(this, value)); if (rv.second) { return NULL; @@ -109,7 +86,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,50 +94,123 @@ 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& list) { - ExtensibleTypes::iterator i = extension_types.begin(); - while (i != extension_types.end()) + std::map::iterator i = types.begin(); + while (i != types.end()) { - ExtensibleTypes::iterator c = i++; - if (c->second->owner == module) - extension_types.erase(c); + std::map::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::iterator i = types.find(name); + if (i == types.end()) + return NULL; + return i->second; +} + +void Extensible::doUnhookExtensions(const std::vector& toRemove) +{ + for(std::vector::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); + } + } +} + +static struct DummyExtensionItem : LocalExtItem +{ + DummyExtensionItem() : LocalExtItem("", NULL) {} + void free(void*) {} +} dummy; + +Extensible::Extensible() +{ + extensions[&dummy] = NULL; +} + +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); } + extensions.clear(); + return classbase::cull(); +} + +Extensible::~Extensible() +{ + if (!extensions.empty() && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, + "Extensible destructor called without cull @%p", (void*)this); } LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod) { } -std::string LocalExtItem::serialize(Module* requestor, const Extensible* container, void* item) +LocalExtItem::~LocalExtItem() +{ +} + +std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const { return ""; } -void LocalExtItem::unserialize(Module* requestor, Extensible* container, const std::string& value) +void LocalExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value) +{ +} + +LocalStringExt::LocalStringExt(const std::string& Key, Module* Owner) + : SimpleExtItem(Key, Owner) { } + +LocalStringExt::~LocalStringExt() { } +std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const +{ + if (item && format == FORMAT_USER) + return *static_cast(item); + return ""; +} + LocalIntExt::LocalIntExt(const std::string& Key, Module* mod) : LocalExtItem(Key, mod) { } -intptr_t LocalIntExt::get(const Extensible* container) +LocalIntExt::~LocalIntExt() +{ +} + +std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) const +{ + if (format != FORMAT_USER) + return ""; + return ConvToStr(reinterpret_cast(item)); +} + +intptr_t LocalIntExt::get(const Extensible* container) const { return reinterpret_cast(get_raw(container)); } @@ -181,17 +231,21 @@ 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(get_raw(container)); } -std::string StringExtItem::serialize(Module* requestor, const Extensible* container, void* item) +std::string StringExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const { return item ? *static_cast(item) : ""; } -void StringExtItem::unserialize(Module* requestor, Extensible* container, const std::string& value) +void StringExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value) { if (value.empty()) unset(container);