-/* +------------------------------------+
- * | 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 <danieldg@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-/* $Core */
-#include "inspircd_config.h"
+#include "inspircd.h"
#include "base.h"
#include <time.h>
-#include "inspircd.h"
+#include <typeinfo>
classbase::classbase()
{
+ if (ServerInstance && ServerInstance->Logs)
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::+ @%p", (void*)this);
}
-bool classbase::cull()
+CullResult classbase::cull()
{
- return true;
+ if (ServerInstance && ServerInstance->Logs)
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::-%s @%p",
+ typeid(*this).name(), (void*)this);
+ return CullResult();
}
classbase::~classbase()
{
+ if (ServerInstance && ServerInstance->Logs)
+ ServerInstance->Logs->Log("CULLLIST", 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;
}
-bool refcountbase::cull()
+void refcountbase::operator delete(void* obj)
{
- return (refcount == 0);
+ 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",
+ (void*)this, refcount);
+}
+
+usecountbase::~usecountbase()
+{
+ if (usecount && ServerInstance && ServerInstance->Logs)
+ ServerInstance->Logs->Log("CULLLIST", DEBUG, "usecountbase::~ @%p with refcount %d",
+ (void*)this, usecount);
+}
+
+ServiceProvider::~ServiceProvider()
{
}
-ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : key(Key), owner(mod)
+ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : ServiceProvider(mod, Key, SERVICE_METADATA)
{
}
return rv;
}
-void ExtensionManager::Register(ExtensionItem* item)
+bool ExtensionManager::Register(ExtensionItem* item)
{
- types.insert(std::make_pair(item->key, item));
+ return types.insert(std::make_pair(item->name, item)).second;
}
-void ExtensionManager::BeginUnregister(Module* module, std::vector<ExtensionItem*>& list)
+void ExtensionManager::BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list)
{
- std::map<std::string, ExtensionItem*>::iterator i = types.begin();
+ std::map<std::string, reference<ExtensionItem> >::iterator i = types.begin();
while (i != types.end())
{
- std::map<std::string, ExtensionItem*>::iterator me = i++;
+ std::map<std::string, reference<ExtensionItem> >::iterator me = i++;
ExtensionItem* item = me->second;
- if (item->owner == module)
+ if (item->creator == module)
{
list.push_back(item);
types.erase(me);
ExtensionItem* ExtensionManager::GetItem(const std::string& name)
{
- std::map<std::string, ExtensionItem*>::iterator i = types.find(name);
+ std::map<std::string, reference<ExtensionItem> >::iterator i = types.find(name);
if (i == types.end())
return NULL;
return i->second;
}
-void Extensible::doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove)
+void Extensible::doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove)
{
- for(std::vector<ExtensionItem*>::const_iterator i = toRemove.begin(); i != toRemove.end(); ++i)
+ for(std::vector<reference<ExtensionItem> >::const_iterator i = toRemove.begin(); i != toRemove.end(); ++i)
{
ExtensionItem* item = *i;
ExtensibleStore::iterator e = extensions.find(item);
}
}
-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)
{
- i->first->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)
{
delete static_cast<std::string*>(item);
}
+
+ModuleException::ModuleException(const std::string &message, Module* who)
+ : CoreException(message, who ? who->ModuleSourceFile : "A Module")
+{
+}
+
projects / user / henk / code / inspircd.git / blobdiff