Deduplicate code in modmanager_static and modmanager_dynamic

4 files changed, 136 insertions, 242 deletions

diff --git a/include/modules.h b/include/modules.h
index f3f40d458..1d9d16f26 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1187,6 +1187,15 @@ class CoreExport ModuleManager
 	/** Internal unload module hook */
 	bool CanUnload(Module*);
 
+	/** Loads all core modules (cmd_*)
+	 */
+	void LoadCoreModules();
+
+	/** Calls the Prioritize() method in all loaded modules
+	 * @return True if all went well, false if a dependency loop was detected
+	 */
+	bool PrioritizeHooks();
+
  public:
 	typedef std::map<std::string, Module*> ModuleMap;
 
diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index de9673996..7789c90bf 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -112,80 +112,13 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 		return true;
 
 	FOREACH_MOD(OnLoadModule, (newmod));
-	/* We give every module a chance to re-prioritize when we introduce a new one,
-	 * not just the one thats loading, as the new module could affect the preference
-	 * of others
-	 */
-	for(int tries = 0; tries < 20; tries++)
-	{
-		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
-		for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
-			n->second->Prioritize();
-
-		if (prioritizationState == PRIO_STATE_LAST)
-			break;
-		if (tries == 19)
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected while loading " + filename);
-	}
-
+	PrioritizeHooks();
 	ServerInstance->ISupport.Build();
 	return true;
 }
 
-namespace {
-	struct UnloadAction : public HandlerBase0<void>
-	{
-		Module* const mod;
-		UnloadAction(Module* m) : mod(m) {}
-		void Call()
-		{
-			DLLManager* dll = mod->ModuleDLLManager;
-			ServerInstance->Modules->DoSafeUnload(mod);
-			ServerInstance->GlobalCulls.Apply();
-			delete dll;
-			ServerInstance->GlobalCulls.AddItem(this);
-		}
-	};
-
-	struct ReloadAction : public HandlerBase0<void>
-	{
-		Module* const mod;
-		HandlerBase1<void, bool>* const callback;
-		ReloadAction(Module* m, HandlerBase1<void, bool>* c)
-			: mod(m), callback(c) {}
-		void Call()
-		{
-			DLLManager* dll = mod->ModuleDLLManager;
-			std::string name = mod->ModuleSourceFile;
-			ServerInstance->Modules->DoSafeUnload(mod);
-			ServerInstance->GlobalCulls.Apply();
-			delete dll;
-			bool rv = ServerInstance->Modules->Load(name.c_str());
-			if (callback)
-				callback->Call(rv);
-			ServerInstance->GlobalCulls.AddItem(this);
-		}
-	};
-}
-
-bool ModuleManager::Unload(Module* mod)
-{
-	if (!CanUnload(mod))
-		return false;
-	ServerInstance->AtomicActions.AddAction(new UnloadAction(mod));
-	return true;
-}
-
-void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
-{
-	if (CanUnload(mod))
-		ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-	else
-		callback->Call(false);
-}
-
 /* We must load the modules AFTER initializing the socket engine, now */
-void ModuleManager::LoadAll()
+void ModuleManager::LoadCoreModules()
 {
 	std::cout << std::endl << "Loading core commands";
 	fflush(stdout);
@@ -212,61 +145,6 @@ void ModuleManager::LoadAll()
 		closedir(library);
 		std::cout << std::endl;
 	}
-
-	ConfigTagList tags = ServerInstance->Config->ConfTags("module");
-	for(ConfigIter i = tags.first; i != tags.second; ++i)
-	{
-		ConfigTag* tag = i->second;
-		std::string name = tag->getString("name");
-		std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
-
-		if (!this->Load(name, true))
-		{
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
-			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
-			ServerInstance->Exit(EXIT_STATUS_MODULE);
-		}
-	}
-
-	ConfigStatus confstatus;
-
-	for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
-	{
-		Module* mod = i->second;
-		try
-		{
-			ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Initializing %s", i->first.c_str());
-			AttachAll(mod);
-			mod->init();
-			mod->ReadConfig(confstatus);
-		}
-		catch (CoreException& modexcept)
-		{
-			LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
-			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
-			ServerInstance->Exit(EXIT_STATUS_MODULE);
-		}
-	}
-
-	/* We give every module a chance to re-prioritize when we introduce a new one,
-	 * not just the one thats loading, as the new module could affect the preference
-	 * of others
-	 */
-	for(int tries = 0; tries < 20; tries++)
-	{
-		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
-		for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
-			n->second->Prioritize();
-
-		if (prioritizationState == PRIO_STATE_LAST)
-			break;
-		if (tries == 19)
-		{
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected");
-			ServerInstance->Exit(EXIT_STATUS_MODULE);
-		}
-	}
 }
 
 #endif
diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index ee248f505..7d6c89258 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -116,134 +116,19 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Unable to load " + name + ": " + modexcept.GetReason());
 		return false;
 	}
-	FOREACH_MOD(OnLoadModule, (mod));
-	/* We give every module a chance to re-prioritize when we introduce a new one,
-	 * not just the one thats loading, as the new module could affect the preference
-	 * of others
-	 */
-	for(int tries = 0; tries < 20; tries++)
-	{
-		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
-		for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
-			n->second->Prioritize();
-
-		if (prioritizationState == PRIO_STATE_LAST)
-			break;
-		if (tries == 19)
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected while loading " + name);
-	}
 
+	FOREACH_MOD(OnLoadModule, (mod));
+	PrioritizeHooks();
 	ServerInstance->ISupport.Build();
 	return true;
 }
 
-namespace {
-	struct UnloadAction : public HandlerBase0<void>
-	{
-		Module* const mod;
-		UnloadAction(Module* m) : mod(m) {}
-		void Call()
-		{
-			ServerInstance->Modules->DoSafeUnload(mod);
-			ServerInstance->GlobalCulls.Apply();
-			ServerInstance->GlobalCulls.AddItem(this);
-		}
-	};
-
-	struct ReloadAction : public HandlerBase0<void>
-	{
-		Module* const mod;
-		HandlerBase1<void, bool>* const callback;
-		ReloadAction(Module* m, HandlerBase1<void, bool>* c)
-			: mod(m), callback(c) {}
-		void Call()
-		{
-			std::string name = mod->ModuleSourceFile;
-			ServerInstance->Modules->DoSafeUnload(mod);
-			ServerInstance->GlobalCulls.Apply();
-			bool rv = ServerInstance->Modules->Load(name.c_str());
-			callback->Call(rv);
-			ServerInstance->GlobalCulls.AddItem(this);
-		}
-	};
-}
-
-bool ModuleManager::Unload(Module* mod)
-{
-	if (!CanUnload(mod))
-		return false;
-	ServerInstance->AtomicActions.AddAction(new UnloadAction(mod));
-	return true;
-}
-
-void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
-{
-	if (CanUnload(mod))
-		ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-	else
-		callback->Call(false);
-}
-
-void ModuleManager::LoadAll()
+void ModuleManager::LoadCoreModules()
 {
 	Load("cmd_all.so", true);
 	Load("cmd_whowas.so", true);
 	Load("cmd_lusers.so", true);
 	Load("cmd_privmsg.so", true);
-
-	ConfigTagList tags = ServerInstance->Config->ConfTags("module");
-	for(ConfigIter i = tags.first; i != tags.second; ++i)
-	{
-		ConfigTag* tag = i->second;
-		std::string name = tag->getString("name");
-		std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
-
-		if (!this->Load(name, true))
-		{
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
-			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
-			ServerInstance->Exit(EXIT_STATUS_MODULE);
-		}
-	}
-
-	ConfigStatus confstatus;
-
-	for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
-	{
-		Module* mod = i->second;
-		try
-		{
-			AttachAll(mod);
-			mod->init();
-			mod->ReadConfig(confstatus);
-		}
-		catch (CoreException& modexcept)
-		{
-			LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
-			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
-			ServerInstance->Exit(EXIT_STATUS_MODULE);
-		}
-	}
-
-	/* We give every module a chance to re-prioritize when we introduce a new one,
-	 * not just the one thats loading, as the new module could affect the preference
-	 * of others
-	 */
-	for(int tries = 0; tries < 20; tries++)
-	{
-		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
-		for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
-			n->second->Prioritize();
-
-		if (prioritizationState == PRIO_STATE_LAST)
-			break;
-		if (tries == 19)
-		{
-			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected");
-			ServerInstance->Exit(EXIT_STATUS_MODULE);
-		}
-	}
 }
 
 #endif
diff --git a/src/modules.cpp b/src/modules.cpp
index 80d80cb43..15e393099 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -24,6 +24,7 @@
  */
 
 
+#include <iostream>
 #include <fstream>
 #include "inspircd.h"
 #include "xline.h"
@@ -317,6 +318,29 @@ swap_now:
 	return true;
 }
 
+bool ModuleManager::PrioritizeHooks()
+{
+	/* We give every module a chance to re-prioritize when we introduce a new one,
+	 * not just the one thats loading, as the new module could affect the preference
+	 * of others
+	 */
+	for (int tries = 0; tries < 20; tries++)
+	{
+		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
+		for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
+			n->second->Prioritize();
+
+		if (prioritizationState == PRIO_STATE_LAST)
+			break;
+		if (tries == 19)
+		{
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected");
+			return false;
+		}
+	}
+	return true;
+}
+
 bool ModuleManager::CanUnload(Module* mod)
 {
 	std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
@@ -414,6 +438,104 @@ void ModuleManager::UnloadAll()
 	}
 }
 
+namespace
+{
+	struct UnloadAction : public HandlerBase0<void>
+	{
+		Module* const mod;
+		UnloadAction(Module* m) : mod(m) {}
+		void Call()
+		{
+			DLLManager* dll = mod->ModuleDLLManager;
+			ServerInstance->Modules->DoSafeUnload(mod);
+			ServerInstance->GlobalCulls.Apply();
+			// In pure static mode this is always NULL
+			delete dll;
+			ServerInstance->GlobalCulls.AddItem(this);
+		}
+	};
+
+	struct ReloadAction : public HandlerBase0<void>
+	{
+		Module* const mod;
+		HandlerBase1<void, bool>* const callback;
+		ReloadAction(Module* m, HandlerBase1<void, bool>* c)
+			: mod(m), callback(c) {}
+		void Call()
+		{
+			DLLManager* dll = mod->ModuleDLLManager;
+			std::string name = mod->ModuleSourceFile;
+			ServerInstance->Modules->DoSafeUnload(mod);
+			ServerInstance->GlobalCulls.Apply();
+			delete dll;
+			bool rv = ServerInstance->Modules->Load(name);
+			if (callback)
+				callback->Call(rv);
+			ServerInstance->GlobalCulls.AddItem(this);
+		}
+	};
+}
+
+bool ModuleManager::Unload(Module* mod)
+{
+	if (!CanUnload(mod))
+		return false;
+	ServerInstance->AtomicActions.AddAction(new UnloadAction(mod));
+	return true;
+}
+
+void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
+{
+	if (CanUnload(mod))
+		ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
+	else
+		callback->Call(false);
+}
+
+void ModuleManager::LoadAll()
+{
+	LoadCoreModules();
+
+	ConfigTagList tags = ServerInstance->Config->ConfTags("module");
+	for (ConfigIter i = tags.first; i != tags.second; ++i)
+	{
+		ConfigTag* tag = i->second;
+		std::string name = tag->getString("name");
+		std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
+
+		if (!this->Load(name, true))
+		{
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
+			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
+			ServerInstance->Exit(EXIT_STATUS_MODULE);
+		}
+	}
+
+	ConfigStatus confstatus;
+
+	for (ModuleMap::const_iterator i = Modules.begin(); i != Modules.end(); ++i)
+	{
+		Module* mod = i->second;
+		try
+		{
+			ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Initializing %s", i->first.c_str());
+			AttachAll(mod);
+			mod->init();
+			mod->ReadConfig(confstatus);
+		}
+		catch (CoreException& modexcept)
+		{
+			LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
+			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
+			ServerInstance->Exit(EXIT_STATUS_MODULE);
+		}
+	}
+
+	if (!PrioritizeHooks())
+		ServerInstance->Exit(EXIT_STATUS_MODULE);
+}
+
 std::string& ModuleManager::LastError()
 {
 	return LastModuleError;