From 083116a89ce922b540ca471a98a8a1e5501491b1 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 14 Oct 2023 17:52:26 -0700 Subject: rewrite tapserver interface for better error handling --- Source/Core/Common/SocketContext.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/SocketContext.cpp') diff --git a/Source/Core/Common/SocketContext.cpp b/Source/Core/Common/SocketContext.cpp index defc333c11..15f9fd9010 100644 --- a/Source/Core/Common/SocketContext.cpp +++ b/Source/Core/Common/SocketContext.cpp @@ -8,12 +8,27 @@ namespace Common #ifdef _WIN32 SocketContext::SocketContext() { - static_cast(WSAStartup(MAKEWORD(2, 2), &m_data)); + std::lock_guard g(s_lock); + if (s_num_objects == 0) + { + static_cast(WSAStartup(MAKEWORD(2, 2), &s_data)); + } + s_num_objects++; } SocketContext::~SocketContext() { - WSACleanup(); + std::lock_guard g(s_lock); + s_num_objects--; + if (s_num_objects == 0) + { + WSACleanup(); + } } + +std::mutex SocketContext::s_lock; +size_t SocketContext::s_num_objects = 0; +WSADATA SocketContext::s_data; + #else SocketContext::SocketContext() = default; SocketContext::~SocketContext() = default; -- cgit v1.2.3