VERY experimental Nintendo Switch 2 emulator
C++
[network, qt] use jthread and use std::vector for packet list instead of std::list (#254)
lizzie19494bc7ac94
diff --git a/src/network/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cppindex d2a47de73d..b01c2ba601 100644--- a/src/network/announce_multiplayer_session.cpp+++ b/src/network/announce_multiplayer_session.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project@@ -19,9 +19,6 @@namespace Core {-// Time between room is announced to web_service-static constexpr std::chrono::seconds announce_time_interval(15);-AnnounceMultiplayerSession::AnnounceMultiplayerSession() {#ifdef ENABLE_WEB_SERVICEbackend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(),@@ -53,18 +50,58 @@ WebService::WebResult AnnounceMultiplayerSession::Register() {}void AnnounceMultiplayerSession::Start() {- if (announce_multiplayer_thread) {+ if (announce_multiplayer_thread.has_value()) {Stop();}- shutdown_event.Reset();- announce_multiplayer_thread =- std::make_unique<std::thread>(&AnnounceMultiplayerSession::AnnounceMultiplayerLoop, this);+ announce_multiplayer_thread.emplace([&](std::stop_token stoken) {+ // Invokes all current bound error callbacks.+ const auto ErrorCallback = [this](WebService::WebResult result) {+ std::lock_guard lock(callback_mutex);+ for (auto callback : error_callbacks)+ (*callback)(result);+ };++ if (!registered) {+ WebService::WebResult result = Register();+ if (result.result_code != WebService::WebResult::Code::Success) {+ ErrorCallback(result);+ return;+ }+ }++ // Time between room is announced to web_service+ std::chrono::seconds const announce_timeslice(15);+ auto update_time = std::chrono::steady_clock::now();+ std::future<WebService::WebResult> future;+ while (!shutdown_event.WaitUntil(update_time)) {+ update_time = std::chrono::steady_clock::now() + announce_timeslice;+ auto room = Network::GetRoom().lock();+ if (!room) {+ break;+ }+ if (room->GetState() != Network::Room::State::Open) {+ break;+ }+ UpdateBackendData(room);+ WebService::WebResult result = backend->Update();+ if (result.result_code != WebService::WebResult::Code::Success) {+ ErrorCallback(result);+ }+ if (result.result_string == "404") {+ registered = false;+ // Needs to register the room again+ WebService::WebResult register_result = Register();+ if (register_result.result_code != WebService::WebResult::Code::Success) {+ ErrorCallback(register_result);+ }+ }+ }+ });}void AnnounceMultiplayerSession::Stop() {- if (announce_multiplayer_thread) {+ if (announce_multiplayer_thread.has_value()) {shutdown_event.Set();- announce_multiplayer_thread->join();announce_multiplayer_thread.reset();backend->Delete();registered = false;@@ -101,58 +138,10 @@ void AnnounceMultiplayerSession::UpdateBackendData(std::shared_ptr<Network::Room}}-void AnnounceMultiplayerSession::AnnounceMultiplayerLoop() {- // Invokes all current bound error callbacks.- const auto ErrorCallback = [this](WebService::WebResult result) {- std::lock_guard lock(callback_mutex);- for (auto callback : error_callbacks) {- (*callback)(result);- }- };-- if (!registered) {- WebService::WebResult result = Register();- if (result.result_code != WebService::WebResult::Code::Success) {- ErrorCallback(result);- return;- }- }-- auto update_time = std::chrono::steady_clock::now();- std::future<WebService::WebResult> future;- while (!shutdown_event.WaitUntil(update_time)) {- update_time += announce_time_interval;- auto room = Network::GetRoom().lock();- if (!room) {- break;- }- if (room->GetState() != Network::Room::State::Open) {- break;- }- UpdateBackendData(room);- WebService::WebResult result = backend->Update();- if (result.result_code != WebService::WebResult::Code::Success) {- ErrorCallback(result);- }- if (result.result_string == "404") {- registered = false;- // Needs to register the room again- WebService::WebResult register_result = Register();- if (register_result.result_code != WebService::WebResult::Code::Success) {- ErrorCallback(register_result);- }- }- }-}-AnnounceMultiplayerRoom::RoomList AnnounceMultiplayerSession::GetRoomList() {return backend->GetRoomList();}-bool AnnounceMultiplayerSession::IsRunning() const {- return announce_multiplayer_thread != nullptr;-}-void AnnounceMultiplayerSession::UpdateCredentials() {ASSERT_MSG(!IsRunning(), "Credentials can only be updated when session is not running");#ifdef ENABLE_WEB_SERVICEdiff --git a/src/network/announce_multiplayer_session.h b/src/network/announce_multiplayer_session.hindex 4e5cd33e1f..8fff450367 100644--- a/src/network/announce_multiplayer_session.h+++ b/src/network/announce_multiplayer_session.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -72,7 +72,9 @@ public:/*** Whether the announce session is still running*/- bool IsRunning() const;+ [[nodiscard]] bool IsRunning() const {+ return announce_multiplayer_thread.has_value();+ }/*** Recreates the backend, updating the credentials.@@ -82,16 +84,13 @@ public:private:void UpdateBackendData(std::shared_ptr<Network::Room> room);- void AnnounceMultiplayerLoop();Common::Event shutdown_event;- std::mutex callback_mutex;std::set<CallbackHandle> error_callbacks;- std::unique_ptr<std::thread> announce_multiplayer_thread;-+ std::optional<std::jthread> announce_multiplayer_thread;/// Backend interface that logs fieldsstd::unique_ptr<AnnounceMultiplayerRoom::Backend> backend;-+ std::mutex callback_mutex;std::atomic_bool registered = false; ///< Whether the room has been registered};diff --git a/src/network/room.cpp b/src/network/room.cppindex ca3946b521..cf33763da2 100644--- a/src/network/room.cpp+++ b/src/network/room.cpp@@ -1,6 +1,5 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later-// SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -13,6 +12,7 @@#include <shared_mutex>#include <sstream>#include <thread>+#include "common/polyfill_thread.h"#include "common/logging/log.h"#include "enet/enet.h"#include "network/packet.h"@@ -54,13 +54,11 @@ public:RoomImpl() : random_gen(std::random_device()()) {}/// Thread that receives and dispatches network packets- std::unique_ptr<std::thread> room_thread;+ std::optional<std::jthread> room_thread;/// Verification backend of the roomstd::unique_ptr<VerifyUser::Backend> verify_backend;- /// Thread function that will receive and dispatch messages until the room is destroyed.- void ServerLoop();void StartLoop();/**@@ -240,59 +238,57 @@ public:};// RoomImpl-void Room::RoomImpl::ServerLoop() {- while (state != State::Closed) {- ENetEvent event;- if (enet_host_service(server, &event, 5) > 0) {- switch (event.type) {- case ENET_EVENT_TYPE_RECEIVE:- switch (event.packet->data[0]) {- case IdJoinRequest:- HandleJoinRequest(&event);- break;- case IdSetGameInfo:- HandleGameInfoPacket(&event);- break;- case IdProxyPacket:- HandleProxyPacket(&event);- break;- case IdLdnPacket:- HandleLdnPacket(&event);- break;- case IdChatMessage:- HandleChatPacket(&event);- break;- // Moderation- case IdModKick:- HandleModKickPacket(&event);- break;- case IdModBan:- HandleModBanPacket(&event);+void Room::RoomImpl::StartLoop() {+ room_thread.emplace([&](std::stop_token stoken) {+ while (state != State::Closed) {+ ENetEvent event;+ if (enet_host_service(server, &event, 5) > 0) {+ switch (event.type) {+ case ENET_EVENT_TYPE_RECEIVE:+ switch (event.packet->data[0]) {+ case IdJoinRequest:+ HandleJoinRequest(&event);+ break;+ case IdSetGameInfo:+ HandleGameInfoPacket(&event);+ break;+ case IdProxyPacket:+ HandleProxyPacket(&event);+ break;+ case IdLdnPacket:+ HandleLdnPacket(&event);+ break;+ case IdChatMessage:+ HandleChatPacket(&event);+ break;+ // Moderation+ case IdModKick:+ HandleModKickPacket(&event);+ break;+ case IdModBan:+ HandleModBanPacket(&event);+ break;+ case IdModUnban:+ HandleModUnbanPacket(&event);+ break;+ case IdModGetBanList:+ HandleModGetBanListPacket(&event);+ break;+ }+ enet_packet_destroy(event.packet);break;- case IdModUnban:- HandleModUnbanPacket(&event);+ case ENET_EVENT_TYPE_DISCONNECT:+ HandleClientDisconnection(event.peer);break;- case IdModGetBanList:- HandleModGetBanListPacket(&event);+ case ENET_EVENT_TYPE_NONE:+ case ENET_EVENT_TYPE_CONNECT:break;}- enet_packet_destroy(event.packet);- break;- case ENET_EVENT_TYPE_DISCONNECT:- HandleClientDisconnection(event.peer);- break;- case ENET_EVENT_TYPE_NONE:- case ENET_EVENT_TYPE_CONNECT:- break;}}- }- // Close the connection to all members:- SendCloseMessage();-}--void Room::RoomImpl::StartLoop() {- room_thread = std::make_unique<std::thread>(&Room::RoomImpl::ServerLoop, this);+ // Close the connection to all members:+ SendCloseMessage();+ });}void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) {@@ -1133,7 +1129,6 @@ void Room::SetVerifyUID(const std::string& uid) {void Room::Destroy() {room_impl->state = State::Closed;- room_impl->room_thread->join();room_impl->room_thread.reset();if (room_impl->server) {diff --git a/src/network/room_member.cpp b/src/network/room_member.cppindex a6845273c5..029e103db4 100644--- a/src/network/room_member.cpp+++ b/src/network/room_member.cpp@@ -1,3 +1,5 @@+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -7,6 +9,7 @@#include <set>#include <thread>#include "common/assert.h"+#include "common/polyfill_thread.h"#include "common/socket_types.h"#include "enet/enet.h"#include "network/packet.h"@@ -18,6 +21,21 @@ constexpr u32 ConnectionTimeoutMs = 5000;class RoomMember::RoomMemberImpl {public:+ void SetState(const State new_state) noexcept {+ if (state != new_state) {+ state = new_state;+ Invoke<State>(state);+ }+ }++ void SetError(const Error new_error) noexcept {+ Invoke<Error>(new_error);+ }++ [[nodiscard]] bool IsConnected() const noexcept {+ return state == State::Joining || state == State::Joined || state == State::Moderator;+ }+ENetHost* client = nullptr; ///< ENet network interface.ENetPeer* server = nullptr; ///< The server peer the client is connected to@@ -30,9 +48,6 @@ public:GameInfo current_game_info;std::atomic<State> state{State::Idle}; ///< Current state of the RoomMember.- void SetState(const State new_state);- void SetError(const Error new_error);- bool IsConnected() const;std::string nickname; ///< The nickname of this member.@@ -43,9 +58,9 @@ public:std::mutex network_mutex; ///< Mutex that controls access to the `client` variable./// Thread that receives and dispatches network packets- std::unique_ptr<std::thread> loop_thread;+ std::optional<std::jthread> loop_thread;std::mutex send_list_mutex; ///< Mutex that controls access to the `send_list` variable.- std::list<Packet> send_list; ///< A list that stores all packets to send the async+ std::vector<Packet> send_list; ///< A list that stores all packets to send the asynctemplate <typename T>using CallbackSet = std::set<CallbackHandle<T>>;@@ -68,8 +83,6 @@ public:};Callbacks callbacks; ///< All CallbackSets to all events- void MemberLoop();-void StartLoop();/**@@ -146,134 +159,117 @@ public:};// RoomMemberImpl-void RoomMember::RoomMemberImpl::SetState(const State new_state) {- if (state != new_state) {- state = new_state;- Invoke<State>(state);- }-}--void RoomMember::RoomMemberImpl::SetError(const Error new_error) {- Invoke<Error>(new_error);-}--bool RoomMember::RoomMemberImpl::IsConnected() const {- return state == State::Joining || state == State::Joined || state == State::Moderator;-}--void RoomMember::RoomMemberImpl::MemberLoop() {- // Receive packets while the connection is open- while (IsConnected()) {- std::lock_guard lock(network_mutex);- ENetEvent event;- if (enet_host_service(client, &event, 5) > 0) {- switch (event.type) {- case ENET_EVENT_TYPE_RECEIVE:- switch (event.packet->data[0]) {- case IdProxyPacket:- HandleProxyPackets(&event);- break;- case IdLdnPacket:- HandleLdnPackets(&event);- break;- case IdChatMessage:- HandleChatPacket(&event);- break;- case IdStatusMessage:- HandleStatusMessagePacket(&event);- break;- case IdRoomInformation:- HandleRoomInformationPacket(&event);- break;- case IdJoinSuccess:- case IdJoinSuccessAsMod:- // The join request was successful, we are now in the room.- // If we joined successfully, there must be at least one client in the room: us.- ASSERT_MSG(member_information.size() > 0,- "We have not yet received member information.");- HandleJoinPacket(&event); // Get the MAC Address for the client- if (event.packet->data[0] == IdJoinSuccessAsMod) {- SetState(State::Moderator);- } else {- SetState(State::Joined);+void RoomMember::RoomMemberImpl::StartLoop() {+ loop_thread.emplace([&](std::stop_token stoken) {+ // Receive packets while the connection is open+ while (IsConnected()) {+ std::lock_guard lock(network_mutex);+ ENetEvent event;+ if (enet_host_service(client, &event, 5) > 0) {+ switch (event.type) {+ case ENET_EVENT_TYPE_RECEIVE:+ switch (event.packet->data[0]) {+ case IdProxyPacket:+ HandleProxyPackets(&event);+ break;+ case IdLdnPacket:+ HandleLdnPackets(&event);+ break;+ case IdChatMessage:+ HandleChatPacket(&event);+ break;+ case IdStatusMessage:+ HandleStatusMessagePacket(&event);+ break;+ case IdRoomInformation:+ HandleRoomInformationPacket(&event);+ break;+ case IdJoinSuccess:+ case IdJoinSuccessAsMod:+ // The join request was successful, we are now in the room.+ // If we joined successfully, there must be at least one client in the room: us.+ ASSERT_MSG(member_information.size() > 0,+ "We have not yet received member information.");+ HandleJoinPacket(&event); // Get the MAC Address for the client+ if (event.packet->data[0] == IdJoinSuccessAsMod) {+ SetState(State::Moderator);+ } else {+ SetState(State::Joined);+ }+ break;+ case IdModBanListResponse:+ HandleModBanListResponsePacket(&event);+ break;+ case IdRoomIsFull:+ SetState(State::Idle);+ SetError(Error::RoomIsFull);+ break;+ case IdNameCollision:+ SetState(State::Idle);+ SetError(Error::NameCollision);+ break;+ case IdIpCollision:+ SetState(State::Idle);+ SetError(Error::IpCollision);+ break;+ case IdVersionMismatch:+ SetState(State::Idle);+ SetError(Error::WrongVersion);+ break;+ case IdWrongPassword:+ SetState(State::Idle);+ SetError(Error::WrongPassword);+ break;+ case IdCloseRoom:+ SetState(State::Idle);+ SetError(Error::LostConnection);+ break;+ case IdHostKicked:+ SetState(State::Idle);+ SetError(Error::HostKicked);+ break;+ case IdHostBanned:+ SetState(State::Idle);+ SetError(Error::HostBanned);+ break;+ case IdModPermissionDenied:+ SetError(Error::PermissionDenied);+ break;+ case IdModNoSuchUser:+ SetError(Error::NoSuchUser);+ break;}+ enet_packet_destroy(event.packet);break;- case IdModBanListResponse:- HandleModBanListResponsePacket(&event);- break;- case IdRoomIsFull:- SetState(State::Idle);- SetError(Error::RoomIsFull);- break;- case IdNameCollision:- SetState(State::Idle);- SetError(Error::NameCollision);- break;- case IdIpCollision:- SetState(State::Idle);- SetError(Error::IpCollision);- break;- case IdVersionMismatch:- SetState(State::Idle);- SetError(Error::WrongVersion);- break;- case IdWrongPassword:- SetState(State::Idle);- SetError(Error::WrongPassword);- break;- case IdCloseRoom:- SetState(State::Idle);- SetError(Error::LostConnection);- break;- case IdHostKicked:- SetState(State::Idle);- SetError(Error::HostKicked);- break;- case IdHostBanned:- SetState(State::Idle);- SetError(Error::HostBanned);+ case ENET_EVENT_TYPE_DISCONNECT:+ if (state == State::Joined || state == State::Moderator) {+ SetState(State::Idle);+ SetError(Error::LostConnection);+ }break;- case IdModPermissionDenied:- SetError(Error::PermissionDenied);+ case ENET_EVENT_TYPE_NONE:break;- case IdModNoSuchUser:- SetError(Error::NoSuchUser);+ case ENET_EVENT_TYPE_CONNECT:+ // The ENET_EVENT_TYPE_CONNECT event can not possibly happen here because we're+ // already connected+ ASSERT_MSG(false, "Received unexpected connect event while already connected");break;}- enet_packet_destroy(event.packet);- break;- case ENET_EVENT_TYPE_DISCONNECT:- if (state == State::Joined || state == State::Moderator) {- SetState(State::Idle);- SetError(Error::LostConnection);- }- break;- case ENET_EVENT_TYPE_NONE:- break;- case ENET_EVENT_TYPE_CONNECT:- // The ENET_EVENT_TYPE_CONNECT event can not possibly happen here because we're- // already connected- ASSERT_MSG(false, "Received unexpected connect event while already connected");- break;}+ std::vector<Packet> packets;+ {+ std::lock_guard send_lock(send_list_mutex);+ packets.swap(send_list);+ }+ for (auto const& packet : packets) {+ ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(),+ ENET_PACKET_FLAG_RELIABLE);+ enet_peer_send(server, 0, enetPacket);+ }+ enet_host_flush(client);}- std::list<Packet> packets;- {- std::lock_guard send_lock(send_list_mutex);- packets.swap(send_list);- }- for (const auto& packet : packets) {- ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(),- ENET_PACKET_FLAG_RELIABLE);- enet_peer_send(server, 0, enetPacket);- }- enet_host_flush(client);- }- Disconnect();-};--void RoomMember::RoomMemberImpl::StartLoop() {- loop_thread = std::make_unique<std::thread>(&RoomMember::RoomMemberImpl::MemberLoop, this);+ Disconnect();+ });}void RoomMember::RoomMemberImpl::Send(Packet&& packet) {@@ -747,9 +743,7 @@ void RoomMember::Unbind(CallbackHandle<T> handle) {void RoomMember::Leave() {room_member_impl->SetState(State::Idle);- room_member_impl->loop_thread->join();room_member_impl->loop_thread.reset();-enet_host_destroy(room_member_impl->client);room_member_impl->client = nullptr;}diff --git a/src/tests/input_common/calibration_configuration_job.cpp b/src/tests/input_common/calibration_configuration_job.cppindex d67d1cbbb4..6ded0dfc86 100644--- a/src/tests/input_common/calibration_configuration_job.cpp+++ b/src/tests/input_common/calibration_configuration_job.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project@@ -22,13 +22,9 @@ public:: socket(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0)) {}~FakeCemuhookServer() {- is_running = false;boost::system::error_code error_code;socket.shutdown(boost::asio::socket_base::shutdown_both, error_code);socket.close();- if (handler.joinable()) {- handler.join();- }}u16 GetPort() {@@ -45,10 +41,9 @@ public:sizeof(InputCommon::CemuhookUDP::Message<InputCommon::CemuhookUDP::Response::PadData>);REQUIRE(touch_movement_path.size() > 0);- is_running = true;- handler = std::thread([touch_movement_path, this]() {+ handler = std::jthread([touch_movement_path, this](std::stop_token stoken) {auto current_touch_position = touch_movement_path.begin();- while (is_running) {+ while (!stoken.stop_requested()) {boost::asio::ip::udp::endpoint sender_endpoint;boost::system::error_code error_code;auto received_size = socket.receive_from(boost::asio::buffer(receive_buffer),@@ -91,8 +86,7 @@ private:boost::asio::ip::udp::socket socket;std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> send_buffer;std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> receive_buffer;- bool is_running = false;- std::thread handler;+ std::jthread handler;};TEST_CASE("CalibrationConfigurationJob completed", "[input_common]") {diff --git a/src/yuzu/applets/qt_software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cppindex 47b6629077..0b894bf51a 100644--- a/src/yuzu/applets/qt_software_keyboard.cpp+++ b/src/yuzu/applets/qt_software_keyboard.cpp@@ -1,6 +1,5 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -1495,53 +1494,36 @@ void QtSoftwareKeyboardDialog::MoveTextCursorDirection(Direction direction) {}void QtSoftwareKeyboardDialog::StartInputThread() {- if (input_thread_running) {- return;- }-- input_thread_running = true;-- input_thread = std::thread(&QtSoftwareKeyboardDialog::InputThread, this);+ input_thread = std::jthread([&](std::stop_token stoken) {+ while (!stoken.stop_requested()) {+ input_interpreter->PollInput();+ HandleButtonPressedOnce<+ Core::HID::NpadButton::A, Core::HID::NpadButton::B, Core::HID::NpadButton::X,+ Core::HID::NpadButton::Y, Core::HID::NpadButton::StickL, Core::HID::NpadButton::StickR,+ Core::HID::NpadButton::L, Core::HID::NpadButton::R, Core::HID::NpadButton::Plus,+ Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,+ Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,+ Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,+ Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,+ Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,+ Core::HID::NpadButton::StickRDown>();+ HandleButtonHold<Core::HID::NpadButton::B, Core::HID::NpadButton::L,+ Core::HID::NpadButton::R, Core::HID::NpadButton::Left,+ Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,+ Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,+ Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,+ Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,+ Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,+ Core::HID::NpadButton::StickRDown>();+ std::this_thread::sleep_for(std::chrono::milliseconds(50));+ }+ });}void QtSoftwareKeyboardDialog::StopInputThread() {- input_thread_running = false;-- if (input_thread.joinable()) {- input_thread.join();- }-- if (input_interpreter) {+ input_thread.request_stop();+ if (input_interpreter)input_interpreter->ResetButtonStates();- }-}--void QtSoftwareKeyboardDialog::InputThread() {- while (input_thread_running) {- input_interpreter->PollInput();-- HandleButtonPressedOnce<- Core::HID::NpadButton::A, Core::HID::NpadButton::B, Core::HID::NpadButton::X,- Core::HID::NpadButton::Y, Core::HID::NpadButton::StickL, Core::HID::NpadButton::StickR,- Core::HID::NpadButton::L, Core::HID::NpadButton::R, Core::HID::NpadButton::Plus,- Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,- Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,- Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,- Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,- Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,- Core::HID::NpadButton::StickRDown>();-- HandleButtonHold<Core::HID::NpadButton::B, Core::HID::NpadButton::L,- Core::HID::NpadButton::R, Core::HID::NpadButton::Left,- Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,- Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,- Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,- Core::HID::NpadButton::StickLDown, Core::HID::NpadButton::StickRLeft,- Core::HID::NpadButton::StickRUp, Core::HID::NpadButton::StickRRight,- Core::HID::NpadButton::StickRDown>();-- std::this_thread::sleep_for(std::chrono::milliseconds(50));- }}QtSoftwareKeyboard::QtSoftwareKeyboard(MainWindow& main_window) {diff --git a/src/yuzu/applets/qt_software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.hindex 4c03df10fc..66359ff11a 100644--- a/src/yuzu/applets/qt_software_keyboard.h+++ b/src/yuzu/applets/qt_software_keyboard.h@@ -1,6 +1,5 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -185,9 +184,6 @@ private:void StartInputThread();void StopInputThread();- /// The thread where input is being polled and processed.- void InputThread();-std::unique_ptr<Ui::QtSoftwareKeyboardDialog> ui;Core::System& system;@@ -223,10 +219,7 @@ private:std::atomic<bool> caps_lock_enabled{false};std::unique_ptr<InputInterpreter> input_interpreter;-- std::thread input_thread;-- std::atomic<bool> input_thread_running{};+ std::jthread input_thread;};class QtSoftwareKeyboard final : public QObject, public Core::Frontend::SoftwareKeyboardApplet {diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cppindex 3d9d851ab6..2141b9d0e7 100644--- a/src/yuzu/applets/qt_web_browser.cpp+++ b/src/yuzu/applets/qt_web_browser.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project@@ -290,54 +290,41 @@ void QtNXWebEngineView::SendKeyPressEvent(int key) {}void QtNXWebEngineView::StartInputThread() {- if (input_thread_running) {- return;- }+ input_thread = std::jthread([&](std::stop_token stoken) {+ // Wait for 1 second before allowing any inputs to be processed.+ std::this_thread::sleep_for(std::chrono::seconds(1));+ if (is_local) {+ QWidget::grabKeyboard();+ }+ while (!stoken.stop_requested()) {+ input_interpreter->PollInput();- input_thread_running = true;- input_thread = std::thread(&QtNXWebEngineView::InputThread, this);-}+ HandleWindowFooterButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,+ Core::HID::NpadButton::X, Core::HID::NpadButton::Y,+ Core::HID::NpadButton::L, Core::HID::NpadButton::R>();-void QtNXWebEngineView::StopInputThread() {- if (is_local) {- QWidget::releaseKeyboard();- }+ HandleWindowKeyButtonPressedOnce<+ Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,+ Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,+ Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,+ Core::HID::NpadButton::StickLDown>();- input_thread_running = false;- if (input_thread.joinable()) {- input_thread.join();- }-}+ HandleWindowKeyButtonHold<+ Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,+ Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,+ Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,+ Core::HID::NpadButton::StickLDown>();-void QtNXWebEngineView::InputThread() {- // Wait for 1 second before allowing any inputs to be processed.- std::this_thread::sleep_for(std::chrono::seconds(1));+ std::this_thread::sleep_for(std::chrono::milliseconds(50));+ }+ });+}+void QtNXWebEngineView::StopInputThread() {if (is_local) {- QWidget::grabKeyboard();- }-- while (input_thread_running) {- input_interpreter->PollInput();-- HandleWindowFooterButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,- Core::HID::NpadButton::X, Core::HID::NpadButton::Y,- Core::HID::NpadButton::L, Core::HID::NpadButton::R>();-- HandleWindowKeyButtonPressedOnce<- Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,- Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,- Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,- Core::HID::NpadButton::StickLDown>();-- HandleWindowKeyButtonHold<- Core::HID::NpadButton::Left, Core::HID::NpadButton::Up, Core::HID::NpadButton::Right,- Core::HID::NpadButton::Down, Core::HID::NpadButton::StickLLeft,- Core::HID::NpadButton::StickLUp, Core::HID::NpadButton::StickLRight,- Core::HID::NpadButton::StickLDown>();-- std::this_thread::sleep_for(std::chrono::milliseconds(50));+ QWidget::releaseKeyboard();}+ input_thread.request_stop();}void QtNXWebEngineView::LoadExtractedFonts() {diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.hindex 70b6d8e050..6a2dd0c8ba 100644--- a/src/yuzu/applets/qt_web_browser.h+++ b/src/yuzu/applets/qt_web_browser.h@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project@@ -158,9 +158,6 @@ private:void StartInputThread();void StopInputThread();- /// The thread where input is being polled and processed.- void InputThread();-/// Loads the extracted fonts using JavaScript.void LoadExtractedFonts();@@ -168,24 +165,13 @@ private:void FocusFirstLinkElement();InputCommon::InputSubsystem* input_subsystem;-std::unique_ptr<UrlRequestInterceptor> url_interceptor;-std::unique_ptr<InputInterpreter> input_interpreter;-- std::thread input_thread;-- std::atomic<bool> input_thread_running{};-+ std::jthread input_thread;std::atomic<bool> finished{};-- Service::AM::Frontend::WebExitReason exit_reason{- Service::AM::Frontend::WebExitReason::EndButtonPressed};-+ Service::AM::Frontend::WebExitReason exit_reason{Service::AM::Frontend::WebExitReason::EndButtonPressed};std::string last_url{"http://localhost/"};-bool is_local{};-QWebEngineProfile* default_profile;QWebEngineSettings* global_settings;};diff --git a/src/yuzu/util/overlay_dialog.cpp b/src/yuzu/util/overlay_dialog.cppindex 466bbe7b25..2d50f22acb 100644--- a/src/yuzu/util/overlay_dialog.cpp+++ b/src/yuzu/util/overlay_dialog.cpp@@ -1,3 +1,5 @@+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -231,34 +233,20 @@ void OverlayDialog::TranslateButtonPress(Core::HID::NpadButton button) {}void OverlayDialog::StartInputThread() {- if (input_thread_running) {- return;- }-- input_thread_running = true;-- input_thread = std::thread(&OverlayDialog::InputThread, this);+ input_thread = std::jthread([&](std::stop_token stoken) {+ while (!stoken.stop_requested()) {+ input_interpreter->PollInput();+ HandleButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,+ Core::HID::NpadButton::Left, Core::HID::NpadButton::Right,+ Core::HID::NpadButton::StickLLeft,+ Core::HID::NpadButton::StickLRight>();+ std::this_thread::sleep_for(std::chrono::milliseconds(50));+ }+ });}void OverlayDialog::StopInputThread() {- input_thread_running = false;-- if (input_thread.joinable()) {- input_thread.join();- }-}--void OverlayDialog::InputThread() {- while (input_thread_running) {- input_interpreter->PollInput();-- HandleButtonPressedOnce<Core::HID::NpadButton::A, Core::HID::NpadButton::B,- Core::HID::NpadButton::Left, Core::HID::NpadButton::Right,- Core::HID::NpadButton::StickLLeft,- Core::HID::NpadButton::StickLRight>();-- std::this_thread::sleep_for(std::chrono::milliseconds(50));- }+ input_thread.request_stop();}void OverlayDialog::keyPressEvent(QKeyEvent* e) {diff --git a/src/yuzu/util/overlay_dialog.h b/src/yuzu/util/overlay_dialog.hindex 62f9da311d..a2c9079e64 100644--- a/src/yuzu/util/overlay_dialog.h+++ b/src/yuzu/util/overlay_dialog.h@@ -1,9 +1,10 @@+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later#pragma once-#include <atomic>#include <memory>#include <thread>@@ -91,9 +92,6 @@ private:void StartInputThread();void StopInputThread();-- /// The thread where input is being polled and processed.- void InputThread();void keyPressEvent(QKeyEvent* e) override;std::unique_ptr<Ui::OverlayDialog> ui;@@ -101,8 +99,5 @@ private:bool use_rich_text;std::unique_ptr<InputInterpreter> input_interpreter;-- std::thread input_thread;-- std::atomic<bool> input_thread_running{};+ std::jthread input_thread;};