X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=caa45c3b045e81de184eae45b7660ab7737088aa;hb=04cfaea87edd1b4b742cb607ea69ece760c460aa;hp=2e2dbfb287d365c78e3022e8c5c5089dca02884d;hpb=9db7af579c46a9f0379fdf71fb773a0a76a94846;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index 2e2dbfb28..caa45c3b0 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,39 +11,77 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd_config.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);
 }
 
 CullResult classbase::cull()
 {
+	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);
 }
 
 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",
+			(void*)this, refcount);
+}
+
+usecountbase::~usecountbase()
+{
+	if (usecount && ServerInstance && ServerInstance->Logs)
+		ServerInstance->Logs->Log("CULLLIST", 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)
 {
 }
 
@@ -88,17 +126,17 @@ void* ExtensionItem::unset_raw(Extensible* container)
 
 void ExtensionManager::Register(ExtensionItem* item)
 {
-	types.insert(std::make_pair(item->key, item));
+	types.insert(std::make_pair(item->name, item));
 }
 
-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);
@@ -108,15 +146,15 @@ void ExtensionManager::BeginUnregister(Module* module, std::vector<ExtensionItem
 
 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);
@@ -128,17 +166,32 @@ void Extensible::doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove)
 	}
 }
 
+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)
@@ -246,3 +299,9 @@ void StringExtItem::free(void* item)
 {
 	delete static_cast<std::string*>(item);
 }
+
+ModuleException::ModuleException(const std::string &message, Module* who)
+	: CoreException(message, who ? who->ModuleSourceFile : "A Module")
+{
+}
+