VERY experimental Nintendo Switch 2 emulator
C++
sockets: avoid locking around socket session calls
Liam9b39e25805f2
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.hindex 45b2c43b7d..d539ed0f49 100644--- a/src/core/hle/service/service.h+++ b/src/core/hle/service/service.h@@ -79,8 +79,8 @@ protected:using HandlerFnP = void (Self::*)(HLERequestContext&);/// Used to gain exclusive access to the service members, e.g. from CoreTiming thread.- [[nodiscard]] std::scoped_lock<std::mutex> LockService() {- return std::scoped_lock{lock_service};+ [[nodiscard]] virtual std::unique_lock<std::mutex> LockService() {+ return std::unique_lock{lock_service};}/// System context that the service operates under.diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cppindex 11f8efbac7..d8509c1dda 100644--- a/src/core/hle/service/sockets/bsd.cpp+++ b/src/core/hle/service/sockets/bsd.cpp@@ -1029,6 +1029,11 @@ BSD::~BSD() {}}+std::unique_lock<std::mutex> BSD::LockService() {+ // Do not lock socket IClient instances.+ return {};+}+BSDCFG::BSDCFG(Core::System& system_) : ServiceFramework{system_, "bsdcfg"} {// clang-format offstatic const FunctionInfo functions[] = {diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.hindex 430edb97ca..161f22b9b1 100644--- a/src/core/hle/service/sockets/bsd.h+++ b/src/core/hle/service/sockets/bsd.h@@ -186,6 +186,9 @@ private:// Callback identifier for the OnProxyPacketReceived event.Network::RoomMember::CallbackHandle<Network::ProxyPacket> proxy_packet_received;++protected:+ virtual std::unique_lock<std::mutex> LockService() override;};class BSDCFG final : public ServiceFramework<BSDCFG> {