X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=17c619fbe28e99a2ae0d6b4b15360cc0f6256d14;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=db8d9f3cfe3dfd836314d41a6f1ca7677fc9090b;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index db8d9f3cf..17c619fbe 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,10 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * 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) 2004-2006 Craig Edwards - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006 Oliver Lupton * * 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 @@ -22,27 +25,34 @@ #include "inspircd.h" #include "base.h" -#include + +#ifdef INSPIRCD_ENABLE_RTTI #include +#endif classbase::classbase() { - if (ServerInstance && ServerInstance->Logs) - ServerInstance->Logs->Log("CULLLIST", LOG_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", LOG_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", LOG_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() @@ -73,14 +83,14 @@ refcountbase::refcountbase() : refcount(0) refcountbase::~refcountbase() { - if (refcount && ServerInstance && ServerInstance->Logs) + if (refcount && ServerInstance) ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d", (void*)this, refcount); } usecountbase::~usecountbase() { - if (usecount && ServerInstance && ServerInstance->Logs) + if (usecount && ServerInstance) ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d", (void*)this, usecount); } @@ -89,7 +99,13 @@ ServiceProvider::~ServiceProvider() { } -ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : ServiceProvider(mod, Key, SERVICE_METADATA) +void ServiceProvider::RegisterService() +{ +} + +ExtensionItem::ExtensionItem(const std::string& Key, ExtensibleType exttype, Module* mod) + : ServiceProvider(mod, Key, SERVICE_METADATA) + , type(exttype) { } @@ -132,6 +148,12 @@ void* ExtensionItem::unset_raw(Extensible* container) return rv; } +void ExtensionItem::RegisterService() +{ + 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; @@ -139,10 +161,10 @@ bool ExtensionManager::Register(ExtensionItem* item) 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->creator == module) { @@ -154,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; @@ -168,71 +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) + 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); +} + +void ExtensionItem::FromNetwork(Extensible* container, const std::string& value) +{ +} + +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); } -LocalExtItem::~LocalExtItem() +std::string ExtensionItem::ToNetwork(const Extensible* container, void* item) const { + return std::string(); } -std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const +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) { } @@ -240,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)); @@ -260,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) { } @@ -277,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); @@ -293,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); } @@ -311,4 +391,3 @@ ModuleException::ModuleException(const std::string &message, Module* who) : CoreException(message, who ? who->ModuleSourceFile : "A Module") { } -