Merge pull request #9832 from liamwhite/hle-mp

service: HLE multiprocess

1 files changed, 14 insertions, 9 deletions

diff --git a/src/core/hle/service/glue/glue.cpp b/src/core/hle/service/glue/glue.cpp
index 717f2562b..993c3d21d 100644
--- a/src/core/hle/service/glue/glue.cpp
+++ b/src/core/hle/service/glue/glue.cpp
@@ -8,25 +8,30 @@
 #include "core/hle/service/glue/ectx.h"
 #include "core/hle/service/glue/glue.h"
 #include "core/hle/service/glue/notif.h"
+#include "core/hle/service/server_manager.h"
 
 namespace Service::Glue {
 
-void InstallInterfaces(Core::System& system) {
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
     // ARP
-    std::make_shared<ARP_R>(system, system.GetARPManager())
-        ->InstallAsService(system.ServiceManager());
-    std::make_shared<ARP_W>(system, system.GetARPManager())
-        ->InstallAsService(system.ServiceManager());
+    server_manager->RegisterNamedService("arp:r",
+                                         std::make_shared<ARP_R>(system, system.GetARPManager()));
+    server_manager->RegisterNamedService("arp:w",
+                                         std::make_shared<ARP_W>(system, system.GetARPManager()));
 
     // BackGround Task Controller
-    std::make_shared<BGTC_T>(system)->InstallAsService(system.ServiceManager());
-    std::make_shared<BGTC_SC>(system)->InstallAsService(system.ServiceManager());
+    server_manager->RegisterNamedService("bgtc:t", std::make_shared<BGTC_T>(system));
+    server_manager->RegisterNamedService("bgtc:sc", std::make_shared<BGTC_SC>(system));
 
     // Error Context
-    std::make_shared<ECTX_AW>(system)->InstallAsService(system.ServiceManager());
+    server_manager->RegisterNamedService("ectx:aw", std::make_shared<ECTX_AW>(system));
 
     // Notification Services for application
-    std::make_shared<NOTIF_A>(system)->InstallAsService(system.ServiceManager());
+    server_manager->RegisterNamedService("notif:a", std::make_shared<NOTIF_A>(system));
+
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::Glue