X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=1f9ba3264d46bfb9be29403f8c14ba56257d9026;hb=d4685e02b55229e0ca5068b839c87b5a80180f33;hp=c0bc40811a6ee0fd32a505471ee8e8f6cefe97a3;hpb=be10eab6ce68d4f06cc7b14bc2fca35e005ce6b5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index c0bc40811..1f9ba3264 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,58 +1,111 @@ -/* +------------------------------------+ - * | 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) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2012, 2014-2015 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * 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 . */ -#include "inspircd_config.h" + +#include "inspircd.h" #include "base.h" #include -#include "inspircd.h" +#ifdef INSPIRCD_ENABLE_RTTI #include +#endif classbase::classbase() { - if (ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::+ @%p", (void*)this); +#ifdef INSPIRCD_ENABLE_RTTI + if (ServerInstance) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+%s @%p", typeid(*this).name(), (void*)this); +#endif } CullResult classbase::cull() { - if (ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::-%s @%p", - typeid(*this).name(), (void*)this); +#ifdef INSPIRCD_ENABLE_RTTI + if (ServerInstance) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p", typeid(*this).name(), (void*)this); +#endif return CullResult(); } classbase::~classbase() { - if (ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::~ @%p", (void*)this); +#ifdef INSPIRCD_ENABLE_RTTI + if (ServerInstance) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~%s @%p", typeid(*this).name(), (void*)this); +#endif } 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); +} + refcountbase::refcountbase() : refcount(0) { + if (this != last_heap) + throw CoreException("Reference allocate on the stack!"); } refcountbase::~refcountbase() { - if (refcount && ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("CULLLIST", DEBUG, "refcountbase::~ @%p with refcount %d", + if (refcount && ServerInstance) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d", (void*)this, refcount); } -ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : key(Key), owner(mod) +usecountbase::~usecountbase() +{ + if (usecount && ServerInstance) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d", + (void*)this, usecount); +} + +ServiceProvider::~ServiceProvider() +{ +} + +void ServiceProvider::RegisterService() +{ +} + +ExtensionItem::ExtensionItem(const std::string& Key, ExtensibleType exttype, Module* mod) + : ServiceProvider(mod, Key, SERVICE_METADATA) + , type(exttype) { } @@ -95,19 +148,25 @@ void* ExtensionItem::unset_raw(Extensible* container) return rv; } -void ExtensionManager::Register(ExtensionItem* item) +void ExtensionItem::RegisterService() { - types.insert(std::make_pair(item->key, item)); + if (!ServerInstance->Extensions.Register(this)) + throw ModuleException("Extension already exists: " + name); +} + +bool ExtensionManager::Register(ExtensionItem* item) +{ + return types.insert(std::make_pair(item->name, item)).second; } void ExtensionManager::BeginUnregister(Module* module, std::vector >& list) { - std::map >::iterator i = types.begin(); + ExtMap::iterator i = types.begin(); while (i != types.end()) { - std::map >::iterator me = i++; + ExtMap::iterator me = i++; ExtensionItem* item = me->second; - if (item->owner == module) + if (item->creator == module) { list.push_back(item); types.erase(me); @@ -117,7 +176,7 @@ void ExtensionManager::BeginUnregister(Module* module, std::vector >::iterator i = types.find(name); + ExtMap::iterator i = types.find(name); if (i == types.end()) return NULL; return i->second; @@ -131,72 +190,125 @@ void Extensible::doUnhookExtensions(const std::vector > ExtensibleStore::iterator e = extensions.find(item); if (e != extensions.end()) { - item->free(e->second); + item->free(this, e->second); extensions.erase(e); } } } -static struct DummyExtensionItem : LocalExtItem -{ - DummyExtensionItem() : LocalExtItem("", NULL) {} - void free(void*) {} -} dummy; - Extensible::Extensible() + : culled(false) { - extensions[&dummy] = NULL; } CullResult Extensible::cull() +{ + FreeAllExtItems(); + culled = true; + return classbase::cull(); +} + +void Extensible::FreeAllExtItems() { for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i) { - i->first->free(i->second); + i->first->free(this, 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); + if ((!extensions.empty() || !culled) && ServerInstance) + 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) +void ExtensionItem::FromInternal(Extensible* container, const std::string& value) { + FromNetwork(container, value); } -LocalExtItem::~LocalExtItem() +void ExtensionItem::FromNetwork(Extensible* container, const std::string& value) { } -std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const +std::string ExtensionItem::ToHuman(const Extensible* container, void* item) const { + // Try to use the network form by default. + std::string ret = ToNetwork(container, item); + + // If there's no network form then fall back to the internal form. + if (ret.empty()) + ret = ToInternal(container, item); + + return ret; +} + +std::string ExtensionItem::ToInternal(const Extensible* container, void* item) const +{ + return ToNetwork(container, item); +} + +std::string ExtensionItem::ToNetwork(const Extensible* container, void* item) const +{ + return std::string(); +} + +std::string ExtensionItem::serialize(SerializeFormat format, const Extensible* container, void* item) const +{ + // Wrap the deprecated API with the new API. + switch (format) + { + case FORMAT_USER: + return ToHuman(container, item); + case FORMAT_INTERNAL: + case FORMAT_PERSIST: + return ToInternal(container, item); + case FORMAT_NETWORK: + return ToNetwork(container, item); + } return ""; } -void LocalExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value) + +void ExtensionItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value) { + // Wrap the deprecated API with the new API. + switch (format) + { + case FORMAT_USER: + break; + case FORMAT_INTERNAL: + case FORMAT_PERSIST: + FromInternal(container, value); + break; + case FORMAT_NETWORK: + FromNetwork(container, value); + break; + } } -LocalStringExt::LocalStringExt(const std::string& Key, Module* Owner) - : SimpleExtItem(Key, Owner) { } +LocalStringExt::LocalStringExt(const std::string& Key, ExtensibleType exttype, Module* Owner) + : SimpleExtItem(Key, exttype, Owner) +{ +} LocalStringExt::~LocalStringExt() { } -std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const +std::string LocalStringExt::ToInternal(const Extensible* container, void* item) const { - if (item && format == FORMAT_USER) - return *static_cast(item); - return ""; + return item ? *static_cast(item) : std::string(); +} + +void LocalStringExt::FromInternal(Extensible* container, const std::string& value) +{ + set(container, value); } -LocalIntExt::LocalIntExt(const std::string& Key, Module* mod) : LocalExtItem(Key, mod) +LocalIntExt::LocalIntExt(const std::string& Key, ExtensibleType exttype, Module* mod) + : ExtensionItem(Key, exttype, mod) { } @@ -204,13 +316,16 @@ LocalIntExt::~LocalIntExt() { } -std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) const +std::string LocalIntExt::ToInternal(const Extensible* container, void* item) const { - if (format != FORMAT_USER) - return ""; return ConvToStr(reinterpret_cast(item)); } +void LocalIntExt::FromInternal(Extensible* container, const std::string& value) +{ + set(container, ConvToNum(value)); +} + intptr_t LocalIntExt::get(const Extensible* container) const { return reinterpret_cast(get_raw(container)); @@ -224,11 +339,12 @@ intptr_t LocalIntExt::set(Extensible* container, intptr_t value) return reinterpret_cast(unset_raw(container)); } -void LocalIntExt::free(void*) +void LocalIntExt::free(Extensible* container, void* item) { } -StringExtItem::StringExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod) +StringExtItem::StringExtItem(const std::string& Key, ExtensibleType exttype, Module* mod) + : ExtensionItem(Key, exttype, mod) { } @@ -241,12 +357,12 @@ 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) const +std::string StringExtItem::ToNetwork(const Extensible* container, void* item) const { - return item ? *static_cast(item) : ""; + return item ? *static_cast(item) : std::string(); } -void StringExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value) +void StringExtItem::FromNetwork(Extensible* container, const std::string& value) { if (value.empty()) unset(container); @@ -257,16 +373,16 @@ void StringExtItem::unserialize(SerializeFormat format, Extensible* container, c void StringExtItem::set(Extensible* container, const std::string& value) { void* old = set_raw(container, new std::string(value)); - delete static_cast(old); + free(container, old); } void StringExtItem::unset(Extensible* container) { void* old = unset_raw(container); - delete static_cast(old); + free(container, old); } -void StringExtItem::free(void* item) +void StringExtItem::free(Extensible* container, void* item) { delete static_cast(item); } @@ -275,13 +391,3 @@ ModuleException::ModuleException(const std::string &message, Module* who) : CoreException(message, who ? who->ModuleSourceFile : "A Module") { } - -ModuleRef::ModuleRef(Module* v) : value(v) -{ - if (value) inc(value); -} - -ModuleRef::~ModuleRef() -{ - if (value) dec(value); -}