From 64ce2012e34bbe7ba031f70173531cf350f4282b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 11 Apr 2023 09:12:01 -0400 Subject: [PATCH 1/2] Common/ENetUtil: Move interface into Common namespace Rather than just being under a separate ENetUtil namespace, we can unify this into the common namespace as Common::ENet. --- Source/Core/Common/ENetUtil.cpp | 4 ++-- Source/Core/Common/ENetUtil.h | 4 ++-- Source/Core/Core/NetPlayClient.cpp | 6 +++--- Source/Core/Core/NetPlayServer.cpp | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp index 3cdfbf8829..3bf524ea8b 100644 --- a/Source/Core/Common/ENetUtil.cpp +++ b/Source/Core/Common/ENetUtil.cpp @@ -6,7 +6,7 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -namespace ENetUtil +namespace Common::ENet { void WakeupThread(ENetHost* host) { @@ -62,4 +62,4 @@ bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id) return true; } -} // namespace ENetUtil +} // namespace Common::ENet diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENetUtil.h index 5b06e5a007..a011e37057 100644 --- a/Source/Core/Common/ENetUtil.h +++ b/Source/Core/Common/ENetUtil.h @@ -9,9 +9,9 @@ #include "Common/CommonTypes.h" -namespace ENetUtil +namespace Common::ENet { void WakeupThread(ENetHost* host); int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event); bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id); -} // namespace ENetUtil +} // namespace Common::ENet diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index db5027fd08..074e4faf54 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -168,7 +168,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay { if (Connect()) { - m_client->intercept = ENetUtil::InterceptCallback; + m_client->intercept = Common::ENet::InterceptCallback; m_thread = std::thread(&NetPlayClient::ThreadFunc, this); } } @@ -1522,7 +1522,7 @@ void NetPlayClient::OnGameDigestAbort() void NetPlayClient::Send(const sf::Packet& packet, const u8 channel_id) { - ENetUtil::SendPacket(m_server, packet, channel_id); + Common::ENet::SendPacket(m_server, packet, channel_id); } void NetPlayClient::DisplayPlayersPing() @@ -1577,7 +1577,7 @@ void NetPlayClient::SendAsync(sf::Packet&& packet, const u8 channel_id) std::lock_guard lkq(m_crit.async_queue_write); m_async_queue.Push(AsyncQueueEntry{std::move(packet), channel_id}); } - ENetUtil::WakeupThread(m_client); + Common::ENet::WakeupThread(m_client); } // called from ---NETPLAY--- thread diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 30a2ba894a..a5e716cd31 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -153,7 +153,7 @@ NetPlayServer::NetPlayServer(const u16 port, const bool forward_port, NetPlayUI* if (m_server != nullptr) { m_server->mtu = std::min(m_server->mtu, NetPlay::MAX_ENET_MTU); - m_server->intercept = ENetUtil::InterceptCallback; + m_server->intercept = Common::ENet::InterceptCallback; } SetupIndex(); @@ -701,7 +701,7 @@ void NetPlayServer::SendAsync(sf::Packet&& packet, const PlayerId pid, const u8 std::lock_guard lkq(m_crit.async_queue_write); m_async_queue.Push(AsyncQueueEntry{std::move(packet), pid, TargetMode::Only, channel_id}); } - ENetUtil::WakeupThread(m_server); + Common::ENet::WakeupThread(m_server); } void NetPlayServer::SendAsyncToClients(sf::Packet&& packet, const PlayerId skip_pid, @@ -712,7 +712,7 @@ void NetPlayServer::SendAsyncToClients(sf::Packet&& packet, const PlayerId skip_ m_async_queue.Push( AsyncQueueEntry{std::move(packet), skip_pid, TargetMode::AllExcept, channel_id}); } - ENetUtil::WakeupThread(m_server); + Common::ENet::WakeupThread(m_server); } void NetPlayServer::SendChunked(sf::Packet&& packet, const PlayerId pid, const std::string& title) @@ -2183,7 +2183,7 @@ void NetPlayServer::SendToClients(const sf::Packet& packet, const PlayerId skip_ void NetPlayServer::Send(ENetPeer* socket, const sf::Packet& packet, const u8 channel_id) { - ENetUtil::SendPacket(socket, packet, channel_id); + Common::ENet::SendPacket(socket, packet, channel_id); } void NetPlayServer::KickPlayer(PlayerId player) From 09e11b80679c3c03796fa78b0f1894a38ea59566 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 11 Apr 2023 11:48:46 -0400 Subject: [PATCH 2/2] Common: Rename ENetUtil.cpp/.h to ENet.cpp/.h --- Source/Core/Common/CMakeLists.txt | 4 ++-- Source/Core/Common/{ENetUtil.cpp => ENet.cpp} | 2 +- Source/Core/Common/{ENetUtil.h => ENet.h} | 0 Source/Core/Core/NetPlayClient.cpp | 2 +- Source/Core/Core/NetPlayServer.cpp | 2 +- Source/Core/DolphinLib.props | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename Source/Core/Common/{ENetUtil.cpp => ENet.cpp} (98%) rename Source/Core/Common/{ENetUtil.h => ENet.h} (100%) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 8269290729..77f9c87a1a 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -41,8 +41,8 @@ add_library(common DebugInterface.h DynamicLibrary.cpp DynamicLibrary.h - ENetUtil.cpp - ENetUtil.h + ENet.cpp + ENet.h EnumFormatter.h EnumMap.h Event.h diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENet.cpp similarity index 98% rename from Source/Core/Common/ENetUtil.cpp rename to Source/Core/Common/ENet.cpp index 3bf524ea8b..b694eba042 100644 --- a/Source/Core/Common/ENetUtil.cpp +++ b/Source/Core/Common/ENet.cpp @@ -1,7 +1,7 @@ // Copyright 2015 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "Common/ENetUtil.h" +#include "Common/ENet.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENet.h similarity index 100% rename from Source/Core/Common/ENetUtil.h rename to Source/Core/Common/ENet.h diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 074e4faf54..0aa235afd2 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -23,7 +23,7 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Crypto/SHA1.h" -#include "Common/ENetUtil.h" +#include "Common/ENet.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index a5e716cd31..9453c97478 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -20,7 +20,7 @@ #include #include "Common/CommonPaths.h" -#include "Common/ENetUtil.h" +#include "Common/ENet.h" #include "Common/FileUtil.h" #include "Common/HttpRequest.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index 44048669a6..0a23ac5c8c 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -42,7 +42,7 @@ - + @@ -753,7 +753,7 @@ - +