X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=66a3cb140076e0db326435458b98b8b7fecf8f06;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=4d0c170776d9c7b4d1bfe47fd7878c669b71214c;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index 4d0c17077..66a3cb140 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,91 +1,106 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2004-2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -/* $Core */ -#include "inspircd_config.h" +#include "inspircd.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::+ @%p", (void*)this); } -void BoolSet::Set(int number) +CullResult classbase::cull() { - this->bits |= bitfields[number]; + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::-%s @%p", + typeid(*this).name(), (void*)this); + return CullResult(); } -void BoolSet::Unset(int number) +classbase::~classbase() { - this->bits &= inverted_bitfields[number]; + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::~ @%p", (void*)this); } -void BoolSet::Invert(int number) +CullResult::CullResult() { - this->bits ^= bitfields[number]; } -bool BoolSet::Get(int number) +// This trick detects heap allocations of refcountbase objects +static void* last_heap = NULL; + +void* refcountbase::operator new(size_t size) { - return ((this->bits | bitfields[number]) > 0); + last_heap = ::operator new(size); + return last_heap; } -bool BoolSet::operator==(BoolSet other) +void refcountbase::operator delete(void* obj) { - return (this->bits == other.bits); + if (last_heap == obj) + last_heap = NULL; + ::operator delete(obj); } -BoolSet BoolSet::operator|(BoolSet other) +refcountbase::refcountbase() : refcount(0) { - BoolSet x(this->bits | other.bits); - return x; + if (this != last_heap) + throw CoreException("Reference allocate on the stack!"); } -BoolSet BoolSet::operator&(BoolSet other) +refcountbase::~refcountbase() { - BoolSet x(this->bits & other.bits); - return x; + if (refcount && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "refcountbase::~ @%p with refcount %d", + (void*)this, refcount); } -BoolSet::BoolSet() +usecountbase::~usecountbase() { - this->bits = 0; + if (usecount && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", DEBUG, "usecountbase::~ @%p with refcount %d", + (void*)this, usecount); } -BoolSet::BoolSet(char bitmask) +ServiceProvider::~ServiceProvider() { - this->bits = bitmask; } -bool BoolSet::operator=(BoolSet other) +ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : ServiceProvider(mod, Key, SERVICE_METADATA) { - 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 +108,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 +124,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 +132,123 @@ void* ExtensionItem::unset_raw(Extensible* container) return rv; } -bool Extensible::Register(ExtensionItem* item) +bool ExtensionManager::Register(ExtensionItem* item) { - return Extensible::extension_types.insert(std::make_pair(item->key, item)).second; + return types.insert(std::make_pair(item->name, item)).second; } -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->creator == 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 +269,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); @@ -215,3 +307,9 @@ void StringExtItem::free(void* item) { delete static_cast(item); } + +ModuleException::ModuleException(const std::string &message, Module* who) + : CoreException(message, who ? who->ModuleSourceFile : "A Module") +{ +} +