Merge pull request #9832 from liamwhite/hle-mp

service: HLE multiprocess

3 files changed, 13 insertions, 16 deletions

diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp
index 330a66409..2789fa1ed 100644
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -881,8 +881,7 @@ void BSD::OnProxyPacketReceived(const Network::ProxyPacket& packet) {
 }
 
 BSD::BSD(Core::System& system_, const char* name)
-    : ServiceFramework{system_, name, ServiceThreadType::CreateNew}, room_network{
-                                                                         system_.GetRoomNetwork()} {
+    : ServiceFramework{system_, name}, room_network{system_.GetRoomNetwork()} {
     // clang-format off
     static const FunctionInfo functions[] = {
         {0, &BSD::RegisterClient, "RegisterClient"},
diff --git a/src/core/hle/service/sockets/sockets.cpp b/src/core/hle/service/sockets/sockets.cpp
index b191b5cf5..676d24e03 100644
--- a/src/core/hle/service/sockets/sockets.cpp
+++ b/src/core/hle/service/sockets/sockets.cpp
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "core/hle/service/server_manager.h"
 #include "core/hle/service/sockets/bsd.h"
 #include "core/hle/service/sockets/nsd.h"
 #include "core/hle/service/sockets/sfdnsres.h"
@@ -8,15 +9,17 @@
 
 namespace Service::Sockets {
 
-void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
-    std::make_shared<BSD>(system, "bsd:s")->InstallAsService(service_manager);
-    std::make_shared<BSD>(system, "bsd:u")->InstallAsService(service_manager);
-    std::make_shared<BSDCFG>(system)->InstallAsService(service_manager);
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
 
-    std::make_shared<NSD>(system, "nsd:a")->InstallAsService(service_manager);
-    std::make_shared<NSD>(system, "nsd:u")->InstallAsService(service_manager);
-
-    std::make_shared<SFDNSRES>(system)->InstallAsService(service_manager);
+    server_manager->RegisterNamedService("bsd:s", std::make_shared<BSD>(system, "bsd:s"));
+    server_manager->RegisterNamedService("bsd:u", std::make_shared<BSD>(system, "bsd:u"));
+    server_manager->RegisterNamedService("bsdcfg", std::make_shared<BSDCFG>(system));
+    server_manager->RegisterNamedService("nsd:a", std::make_shared<NSD>(system, "nsd:a"));
+    server_manager->RegisterNamedService("nsd:u", std::make_shared<NSD>(system, "nsd:u"));
+    server_manager->RegisterNamedService("sfdnsres", std::make_shared<SFDNSRES>(system));
+    server_manager->StartAdditionalHostThreads("bsdsocket", 2);
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::Sockets
diff --git a/src/core/hle/service/sockets/sockets.h b/src/core/hle/service/sockets/sockets.h
index 9840c11f9..acd2dae7b 100644
--- a/src/core/hle/service/sockets/sockets.h
+++ b/src/core/hle/service/sockets/sockets.h
@@ -10,10 +10,6 @@ namespace Core {
 class System;
 }
 
-namespace Service::SM {
-class ServiceManager;
-}
-
 namespace Service::Sockets {
 
 enum class Errno : u32 {
@@ -99,7 +95,6 @@ struct Linger {
     u32 linger;
 };
 
-/// Registers all Sockets services with the specified service manager.
-void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system);
+void LoopProcess(Core::System& system);
 
 } // namespace Service::Sockets