X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=db8d9f3cfe3dfd836314d41a6f1ca7677fc9090b;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=9307928540639b721cda966221dac65cdd06cb27;hpb=3dc81ee1331d1b37ee85be9bf0d843e3b6827a2d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index 930792854..db8d9f3cf 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,54 +1,95 @@ -/* +------------------------------------+ - * | 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", LOG_DEBUG, "classbase::+ @%p", (void*)this); } -bool classbase::cull() +CullResult classbase::cull() { - return true; + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p", + typeid(*this).name(), (void*)this); + return CullResult(); } classbase::~classbase() { + if (ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~ @%p", (void*)this); } -refcountbase::refcountbase() : refcount(0) +CullResult::CullResult() +{ +} + +// This trick detects heap allocations of refcountbase objects +static void* last_heap = NULL; + +void* refcountbase::operator new(size_t size) +{ + last_heap = ::operator new(size); + return last_heap; +} + +void refcountbase::operator delete(void* obj) { + if (last_heap == obj) + last_heap = NULL; + ::operator delete(obj); } -bool refcountbase::cull() +refcountbase::refcountbase() : refcount(0) { - return (refcount == 0); + if (this != last_heap) + throw CoreException("Reference allocate on the stack!"); } refcountbase::~refcountbase() { + if (refcount && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d", + (void*)this, refcount); +} + +usecountbase::~usecountbase() +{ + if (usecount && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d", + (void*)this, usecount); } -ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : key(Key), owner(mod) +ServiceProvider::~ServiceProvider() +{ +} + +ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : ServiceProvider(mod, Key, SERVICE_METADATA) { } @@ -56,9 +97,10 @@ 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; @@ -66,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; @@ -82,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; @@ -90,50 +132,73 @@ 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; } -std::vector Extensible::BeginUnregister(Module* module) +void ExtensionManager::BeginUnregister(Module* module, std::vector >& list) { - std::vector rv; - 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) + std::map >::iterator me = i++; + ExtensionItem* item = me->second; + if (item->creator == module) { - rv.push_back(c->second); - extension_types.erase(c); + list.push_back(item); + types.erase(me); } } - return rv; } -void Extensible::doUnhookExtensions(const std::vector& toRemove) +ExtensionItem* ExtensionManager::GetItem(const std::string& name) { - for(std::vector::const_iterator i = toRemove.begin(); i != toRemove.end(); i++) + 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) { - ExtensibleStore::iterator e = extensions.find((**i).key); + ExtensionItem* item = *i; + ExtensibleStore::iterator e = extensions.find(item); if (e != extensions.end()) { - (**i).free(e->second); + item->free(e->second); extensions.erase(e); } } } -Extensible::~Extensible() +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 = GetItem(i->first); - if (type) - type->free(i->second); - else if (ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("BASE", ERROR, "Extension type %s is not registered", i->first.c_str()); + i->first->free(i->second); } + extensions.clear(); + return classbase::cull(); +} + +Extensible::~Extensible() +{ + if (!extensions.empty() && ServerInstance && ServerInstance->Logs) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Extensible destructor called without cull @%p", (void*)this); } LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod) @@ -144,7 +209,7 @@ LocalExtItem::~LocalExtItem() { } -std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) +std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const { return ""; } @@ -160,7 +225,7 @@ LocalStringExt::~LocalStringExt() { } -std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) +std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const { if (item && format == FORMAT_USER) return *static_cast(item); @@ -175,14 +240,14 @@ LocalIntExt::~LocalIntExt() { } -std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) +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) +intptr_t LocalIntExt::get(const Extensible* container) const { return reinterpret_cast(get_raw(container)); } @@ -207,12 +272,12 @@ StringExtItem::~StringExtItem() { } -std::string* StringExtItem::get(const Extensible* container) +std::string* StringExtItem::get(const Extensible* container) const { return static_cast(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(item) : ""; } @@ -241,3 +306,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") +{ +} +