Allow serializable fields to use storage in the respective objects.

Split service management code nito a proper servicemanager. Make service
references managed instead of lazy lookup. Also made events and
serializable use service manager instead of their respective systems for
management

1 files changed, 144 insertions, 0 deletions

diff --git a/src/service_manager.cpp b/src/service_manager.cpp
new file mode 100644
index 000000000..0d9255c7d
--- /dev/null
+++ b/src/service_manager.cpp
@@ -0,0 +1,144 @@
+/*
+ *
+ * (C) 2016 Anope Team
+ * (C) 2016 Adam <Adam@anope.org>
+ *
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ *
+ */
+
+#include "services.h"
+#include "service.h"
+#include "logger.h"
+
+ServiceManager *ServiceManager::manager = nullptr;
+
+void ServiceManager::Init()
+{
+	assert(manager == nullptr);
+	manager = new ServiceManager();
+}
+
+ServiceManager *ServiceManager::Get()
+{
+	return manager;
+}
+
+void ServiceManager::Destroy()
+{
+	delete manager;
+	manager = nullptr;
+}
+
+Service *ServiceManager::FindService(const Anope::string &name)
+{
+	for (Service *s : services)
+		if (s->GetName() == name)
+			return s;
+	return nullptr;
+}
+
+Service *ServiceManager::FindService(const Anope::string &type, const Anope::string &name)
+{
+	for (Service *s : services)
+		if (s->GetType() == type && s->GetName() == name)
+			return s;
+	return nullptr;
+}
+
+std::vector<Service *> ServiceManager::FindServices(const Anope::string &type)
+{
+	std::vector<Service *> v;
+
+	for (Service *s : services)
+		if (s->GetType() == type)
+			v.push_back(s);
+
+	return v;
+}
+
+void ServiceManager::AddAlias(const Anope::string &t, const Anope::string &n, const Anope::string &v)
+{
+#warning "aliases dont work"
+//	std::map<Anope::string, Anope::string> &smap = aliases[t];
+//	smap[n] = v;
+}
+
+void ServiceManager::DelAlias(const Anope::string &t, const Anope::string &n)
+{
+//	std::map<Anope::string, Anope::string> &smap = aliases[t];
+//	smap.erase(n);
+//	if (smap.empty())
+//		aliases.erase(t);
+}
+
+void ServiceManager::Register(Service *service)
+{
+	// assert type
+	if (service->GetType().empty())
+		throw ModuleException("Service type must be non empty");
+
+	if (service->GetName().empty() == false)
+	{
+		Service *s = FindService(service->GetType(), service->GetName());
+
+		if (s != nullptr)
+			throw ModuleException("Service of type " + service->GetType() + " with name " + service->GetName() + " already exists");
+	}
+
+	Log(LOG_DEBUG_2) << "Service registered: " << service->GetType() << " " << service->GetName() << " address " << static_cast<void *>(this) << " by " << service->GetOwner();
+
+	services.push_back(service);
+
+	LookupAll();
+}
+
+void ServiceManager::Unregister(Service *service)
+{
+	Log(LOG_DEBUG_2) <<  "Service unregistered: " << service->GetType() << " " << service->GetName() << " address " << static_cast<void *>(service) << " by " << service->GetOwner();
+
+	auto it = std::find(services.begin(), services.end(), service);
+	if (it != services.end())
+	{
+		services.erase(it);
+
+		LookupAll();
+	}
+}
+
+void ServiceManager::Lookup(ServiceReferenceBase *reference)
+{
+	if (reference->GetName().empty())
+	{
+		std::vector<Service *> services = this->FindServices(reference->GetType());
+		Log(LOG_DEBUG_2) << "Service lookup " << static_cast<void *>(reference) << " type " << reference->GetType() << " name " << reference->GetName() << ": " << services.size() << " services";
+		reference->SetServices(services);
+	}
+	else
+	{
+		Service *service = this->FindService(reference->GetType(), reference->GetName());
+		Log(LOG_DEBUG_2) << "Service lookup " << static_cast<void *>(reference) << " type " << reference->GetType() << " name " << reference->GetName() << ": " << service;
+		reference->SetService(service);
+	}
+}
+
+void ServiceManager::LookupAll()
+{
+	for (ServiceReferenceBase *s : references)
+		Lookup(s);
+}
+
+void ServiceManager::RegisterReference(ServiceReferenceBase *reference)
+{
+	Lookup(reference);
+	this->references.push_back(reference);
+}
+
+void ServiceManager::UnregisterReference(ServiceReferenceBase *reference)
+{
+	auto it = std::find(this->references.begin(), this->references.end(), reference);
+	if (it != this->references.end())
+		this->references.erase(it);
+}