From a9369726147c7499e0016e183d5d56a7b44efe4b Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Sat, 18 Feb 2023 16:26:48 -0500
Subject: service: refactor server architecture

Converts services to have their own processes
---
 src/core/hle/service/pm/pm.cpp | 16 ++++++++++------
 src/core/hle/service/pm/pm.h   |  3 +--
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/core/hle/service/pm')

diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp
index b10e86c8f..02a4ca13b 100644
--- a/src/core/hle/service/pm/pm.cpp
+++ b/src/core/hle/service/pm/pm.cpp
@@ -6,6 +6,7 @@
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/pm/pm.h"
+#include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
 
 namespace Service::PM {
@@ -262,12 +263,15 @@ private:
     const Kernel::KernelCore& kernel;
 };
 
-void InstallInterfaces(Core::System& system) {
-    std::make_shared<BootMode>(system)->InstallAsService(system.ServiceManager());
-    std::make_shared<DebugMonitor>(system)->InstallAsService(system.ServiceManager());
-    std::make_shared<Info>(system, system.Kernel().GetProcessList())
-        ->InstallAsService(system.ServiceManager());
-    std::make_shared<Shell>(system)->InstallAsService(system.ServiceManager());
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
+    server_manager->RegisterNamedService("pm:bm", std::make_shared<BootMode>(system));
+    server_manager->RegisterNamedService("pm:dmnt", std::make_shared<DebugMonitor>(system));
+    server_manager->RegisterNamedService(
+        "pm:info", std::make_shared<Info>(system, system.Kernel().GetProcessList()));
+    server_manager->RegisterNamedService("pm:shell", std::make_shared<Shell>(system));
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::PM
diff --git a/src/core/hle/service/pm/pm.h b/src/core/hle/service/pm/pm.h
index 060103928..5d4a1a171 100644
--- a/src/core/hle/service/pm/pm.h
+++ b/src/core/hle/service/pm/pm.h
@@ -14,7 +14,6 @@ enum class SystemBootMode {
     Maintenance,
 };
 
-/// Registers all PM services with the specified service manager.
-void InstallInterfaces(Core::System& system);
+void LoopProcess(Core::System& system);
 
 } // namespace Service::PM
-- 
cgit v1.2.3