VERY experimental Nintendo Switch 2 emulator
C++
[common] use libc++ provided jthread instead of in-house one (which deadlocks on FBSD 14) (#351)
lizziedfe10bc85196
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 3599105020..eda6969f31 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -319,6 +319,18 @@ if (YUZU_ROOM)add_compile_definitions(YUZU_ROOM)endif()+if (ANDROID OR PLATFORM_FREEBSD OR PLATFORM_OPENBSD OR PLATFORM_SUN OR APPLE)+ if(CXX_APPLE OR CXX_CLANG)+ # libc++ has stop_token and jthread as experimental+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexperimental-library")+ else()+ # Uses glibc, mostly?+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")+ endif()+endif()+# Build/optimization presetsif (PLATFORM_LINUX OR CXX_CLANG)if (ARCHITECTURE_x86_64)diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cppindex 4d7f0c1d5d..b75d743494 100644--- a/src/audio_core/sink/sink_stream.cpp+++ b/src/audio_core/sink/sink_stream.cpp@@ -293,8 +293,7 @@ void SinkStream::WaitFreeSpace(std::stop_token stop_token) {release_cv.wait_for(lk, std::chrono::milliseconds(5),[this]() { return paused || queued_buffers < max_queue_size; });if (queued_buffers > max_queue_size + 3) {- Common::CondvarWait(release_cv, lk, stop_token,- [this] { return paused || queued_buffers < max_queue_size; });+ release_cv.wait(lk, stop_token, [this] { return paused || queued_buffers < max_queue_size; });}}diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.hindex b36fc1de96..80f32e2553 100644--- a/src/common/bounded_threadsafe_queue.h+++ b/src/common/bounded_threadsafe_queue.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -123,7 +126,7 @@ private:} else if constexpr (Mode == PopMode::WaitWithStopToken) {// Wait until the queue is not empty.std::unique_lock lock{consumer_cv_mutex};- Common::CondvarWait(consumer_cv, lock, stop_token, [this, read_index] {+ consumer_cv.wait(lock, stop_token, [this, read_index] {return read_index != m_write_index.load(std::memory_order::acquire);});if (stop_token.stop_requested()) {diff --git a/src/common/polyfill_thread.h b/src/common/polyfill_thread.hindex 12e59a8939..0d3c963d25 100644--- a/src/common/polyfill_thread.h+++ b/src/common/polyfill_thread.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -7,23 +10,13 @@#pragma once-#include <version>--#ifdef __cpp_lib_jthread-#include <chrono>#include <condition_variable>-#include <stop_token>#include <thread>#include <utility>namespace Common {-template <typename Condvar, typename Lock, typename Pred>-void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred&& pred) {- cv.wait(lk, token, std::forward<Pred>(pred));-}-template <typename Rep, typename Period>bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep, Period>& rel_time) {std::condition_variable_any cv;@@ -35,341 +28,3 @@ bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep,}} // namespace Common--#else--#include <atomic>-#include <chrono>-#include <condition_variable>-#include <functional>-#include <map>-#include <memory>-#include <mutex>-#include <optional>-#include <thread>-#include <type_traits>-#include <utility>--namespace std {-namespace polyfill {--using stop_state_callback = size_t;--class stop_state {-public:- stop_state() = default;- ~stop_state() = default;-- bool request_stop() {- unique_lock lk{m_lock};-- if (m_stop_requested) {- // Already set, nothing to do.- return false;- }-- // Mark stop requested.- m_stop_requested = true;-- while (!m_callbacks.empty()) {- // Get an iterator to the first element.- const auto it = m_callbacks.begin();-- // Move the callback function out of the map.- function<void()> f;- swap(it->second, f);-- // Erase the now-empty map element.- m_callbacks.erase(it);-- // Run the callback.- if (f) {- f();- }- }-- return true;- }-- bool stop_requested() const {- unique_lock lk{m_lock};- return m_stop_requested;- }-- stop_state_callback insert_callback(function<void()> f) {- unique_lock lk{m_lock};-- if (m_stop_requested) {- // Stop already requested. Don't insert anything,- // just run the callback synchronously.- if (f) {- f();- }- return 0;- }-- // Insert the callback.- stop_state_callback ret = ++m_next_callback;- m_callbacks.emplace(ret, std::move(f));- return ret;- }-- void remove_callback(stop_state_callback cb) {- unique_lock lk{m_lock};- m_callbacks.erase(cb);- }--private:- mutable recursive_mutex m_lock;- map<stop_state_callback, function<void()>> m_callbacks;- stop_state_callback m_next_callback{0};- bool m_stop_requested{false};-};--} // namespace polyfill--class stop_token;-class stop_source;-struct nostopstate_t {- explicit nostopstate_t() = default;-};-inline constexpr nostopstate_t nostopstate{};--template <class Callback>-class stop_callback;--class stop_token {-public:- stop_token() noexcept = default;-- stop_token(const stop_token&) noexcept = default;- stop_token(stop_token&&) noexcept = default;- stop_token& operator=(const stop_token&) noexcept = default;- stop_token& operator=(stop_token&&) noexcept = default;- ~stop_token() = default;-- void swap(stop_token& other) noexcept {- m_stop_state.swap(other.m_stop_state);- }-- [[nodiscard]] bool stop_requested() const noexcept {- return m_stop_state && m_stop_state->stop_requested();- }- [[nodiscard]] bool stop_possible() const noexcept {- return m_stop_state != nullptr;- }--private:- friend class stop_source;- template <typename Callback>- friend class stop_callback;- stop_token(shared_ptr<polyfill::stop_state> stop_state) : m_stop_state(std::move(stop_state)) {}--private:- shared_ptr<polyfill::stop_state> m_stop_state;-};--class stop_source {-public:- stop_source() : m_stop_state(make_shared<polyfill::stop_state>()) {}- explicit stop_source(nostopstate_t) noexcept {}-- stop_source(const stop_source&) noexcept = default;- stop_source(stop_source&&) noexcept = default;- stop_source& operator=(const stop_source&) noexcept = default;- stop_source& operator=(stop_source&&) noexcept = default;- ~stop_source() = default;- void swap(stop_source& other) noexcept {- m_stop_state.swap(other.m_stop_state);- }-- [[nodiscard]] stop_token get_token() const noexcept {- return stop_token(m_stop_state);- }- [[nodiscard]] bool stop_possible() const noexcept {- return m_stop_state != nullptr;- }- [[nodiscard]] bool stop_requested() const noexcept {- return m_stop_state && m_stop_state->stop_requested();- }- bool request_stop() noexcept {- return m_stop_state && m_stop_state->request_stop();- }--private:- friend class jthread;- explicit stop_source(shared_ptr<polyfill::stop_state> stop_state)- : m_stop_state(std::move(stop_state)) {}--private:- shared_ptr<polyfill::stop_state> m_stop_state;-};--template <typename Callback>-class stop_callback {- static_assert(is_nothrow_destructible_v<Callback>);- static_assert(is_invocable_v<Callback>);--public:- using callback_type = Callback;-- template <typename C>- requires constructible_from<Callback, C>- explicit stop_callback(const stop_token& st,- C&& cb) noexcept(is_nothrow_constructible_v<Callback, C>)- : m_stop_state(st.m_stop_state) {- if (m_stop_state) {- m_callback = m_stop_state->insert_callback(std::move(cb));- }- }- template <typename C>- requires constructible_from<Callback, C>- explicit stop_callback(stop_token&& st,- C&& cb) noexcept(is_nothrow_constructible_v<Callback, C>)- : m_stop_state(std::move(st.m_stop_state)) {- if (m_stop_state) {- m_callback = m_stop_state->insert_callback(std::move(cb));- }- }- ~stop_callback() {- if (m_stop_state && m_callback) {- m_stop_state->remove_callback(m_callback);- }- }-- stop_callback(const stop_callback&) = delete;- stop_callback(stop_callback&&) = delete;- stop_callback& operator=(const stop_callback&) = delete;- stop_callback& operator=(stop_callback&&) = delete;--private:- shared_ptr<polyfill::stop_state> m_stop_state;- polyfill::stop_state_callback m_callback;-};--template <typename Callback>-stop_callback(stop_token, Callback) -> stop_callback<Callback>;--class jthread {-public:- using id = thread::id;- using native_handle_type = thread::native_handle_type;-- jthread() noexcept = default;-- template <typename F, typename... Args,- typename = enable_if_t<!is_same_v<remove_cvref_t<F>, jthread>>>- explicit jthread(F&& f, Args&&... args)- : m_stop_state(make_shared<polyfill::stop_state>()),- m_thread(make_thread(std::forward<F>(f), std::forward<Args>(args)...)) {}-- ~jthread() {- if (joinable()) {- request_stop();- join();- }- }-- jthread(const jthread&) = delete;- jthread(jthread&&) noexcept = default;- jthread& operator=(const jthread&) = delete;-- jthread& operator=(jthread&& other) noexcept {- m_thread.swap(other.m_thread);- m_stop_state.swap(other.m_stop_state);- return *this;- }-- void swap(jthread& other) noexcept {- m_thread.swap(other.m_thread);- m_stop_state.swap(other.m_stop_state);- }- [[nodiscard]] bool joinable() const noexcept {- return m_thread.joinable();- }- void join() {- m_thread.join();- }- void detach() {- m_thread.detach();- m_stop_state.reset();- }-- [[nodiscard]] id get_id() const noexcept {- return m_thread.get_id();- }- [[nodiscard]] native_handle_type native_handle() {- return m_thread.native_handle();- }- [[nodiscard]] stop_source get_stop_source() noexcept {- return stop_source(m_stop_state);- }- [[nodiscard]] stop_token get_stop_token() const noexcept {- return stop_source(m_stop_state).get_token();- }- bool request_stop() noexcept {- return get_stop_source().request_stop();- }- [[nodiscard]] static unsigned int hardware_concurrency() noexcept {- return thread::hardware_concurrency();- }--private:- template <typename F, typename... Args>- thread make_thread(F&& f, Args&&... args) {- if constexpr (is_invocable_v<decay_t<F>, stop_token, decay_t<Args>...>) {- return thread(std::forward<F>(f), get_stop_token(), std::forward<Args>(args)...);- } else {- return thread(std::forward<F>(f), std::forward<Args>(args)...);- }- }-- shared_ptr<polyfill::stop_state> m_stop_state;- thread m_thread;-};--} // namespace std--namespace Common {--template <typename Condvar, typename Lock, typename Pred>-void CondvarWait(Condvar& cv, std::unique_lock<Lock>& lk, std::stop_token token, Pred pred) {- if (token.stop_requested()) {- return;- }-- std::stop_callback callback(token, [&] {- { std::scoped_lock lk2{*lk.mutex()}; }- cv.notify_all();- });-- cv.wait(lk, [&] { return pred() || token.stop_requested(); });-}--template <typename Rep, typename Period>-bool StoppableTimedWait(std::stop_token token, const std::chrono::duration<Rep, Period>& rel_time) {- if (token.stop_requested()) {- return false;- }-- bool stop_requested = false;- std::condition_variable cv;- std::mutex m;-- std::stop_callback cb(token, [&] {- // Wake up the waiting thread.- {- std::scoped_lock lk{m};- stop_requested = true;- }- cv.notify_one();- });-- // Perform the timed wait.- std::unique_lock lk{m};- return !cv.wait_for(lk, rel_time, [&] { return stop_requested; });-}--} // namespace Common--#endifdiff --git a/src/common/thread.h b/src/common/thread.hindex c6976fb6cd..5ab495baaa 100644--- a/src/common/thread.h+++ b/src/common/thread.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: 2013 Dolphin Emulator Project// SPDX-FileCopyrightText: 2014 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -80,7 +83,7 @@ public:condvar.notify_all();return true;} else {- CondvarWait(condvar, lk, token,+ condvar.wait(lk, token,[this, current_generation] { return current_generation != generation; });return !token.stop_requested();}diff --git a/src/common/thread_worker.h b/src/common/thread_worker.hindex 260ad44e45..6ec9d6a2bd 100644--- a/src/common/thread_worker.h+++ b/src/common/thread_worker.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -47,8 +50,8 @@ public:if (requests.empty()) {wait_condition.notify_all();}- Common::CondvarWait(condition, lock, stop_token,- [this] { return !requests.empty(); });+ condition.wait(lock, stop_token,+ [this] { return !requests.empty(); });if (stop_token.stop_requested()) {break;}diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.hindex 2ef1da0644..f9fc0ca171 100644--- a/src/common/threadsafe_queue.h+++ b/src/common/threadsafe_queue.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: 2010 Dolphin Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -99,7 +102,11 @@ public:T PopWait(std::stop_token stop_token) {if (Empty()) {std::unique_lock lock{cv_mutex};- Common::CondvarWait(cv, lock, stop_token, [this] { return !Empty(); });+ if constexpr (with_stop_token) {+ cv.wait(lock, stop_token, [this] { return !Empty(); });+ } else {+ cv.wait(lock, [this] { return !Empty(); });+ }}if (stop_token.stop_requested()) {return T{};diff --git a/src/video_core/cdma_pusher.cpp b/src/video_core/cdma_pusher.cppindex 1b6b4c6d45..b9140d9335 100644--- a/src/video_core/cdma_pusher.cpp+++ b/src/video_core/cdma_pusher.cpp@@ -39,8 +39,8 @@ void CDmaPusher::ProcessEntries(std::stop_token stop_token) {while (!stop_token.stop_requested()) {{std::unique_lock l{command_mutex};- Common::CondvarWait(command_cv, l, stop_token,- [this]() { return command_lists.size() > 0; });+ command_cv.wait(l, stop_token,+ [this]() { return command_lists.size() > 0; });if (stop_token.stop_requested()) {return;}diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cppindex 9392534e7d..8739905d99 100644--- a/src/video_core/gpu_thread.cpp+++ b/src/video_core/gpu_thread.cpp@@ -116,7 +116,7 @@ u64 ThreadManager::PushCommand(CommandData&& command_data, bool block) {state.queue.EmplaceWait(std::move(command_data), fence, block);if (block) {- Common::CondvarWait(state.cv, lk, thread.get_stop_token(), [this, fence] {+ state.cv.wait(lk, thread.get_stop_token(), [this, fence] {return fence <= state.signaled_fence.load(std::memory_order_relaxed);});}diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp b/src/video_core/renderer_vulkan/vk_master_semaphore.cppindex 6761127582..e65755de64 100644--- a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp+++ b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp@@ -208,7 +208,7 @@ void MasterSemaphore::WaitThread(std::stop_token token) {vk::Fence fence;{std::unique_lock lock{wait_mutex};- Common::CondvarWait(wait_cv, lock, token, [this] { return !wait_queue.empty(); });+ wait_cv.wait(lock, token, [this] { return !wait_queue.empty(); });if (token.stop_requested()) {return;}diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cppindex 23279e49b9..0b29ad1389 100644--- a/src/video_core/renderer_vulkan/vk_present_manager.cpp+++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp@@ -279,7 +279,7 @@ void PresentManager::PresentThread(std::stop_token token) {std::unique_lock lock{queue_mutex};// Wait for presentation frames- Common::CondvarWait(frame_cv, lock, token, [this] { return !present_queue.empty(); });+ frame_cv.wait(lock, token, [this] { return !present_queue.empty(); });if (token.stop_requested()) {return;}diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cppindex 530d161dfe..d109d22cab 100644--- a/src/video_core/renderer_vulkan/vk_scheduler.cpp+++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp@@ -166,7 +166,7 @@ void Scheduler::WorkerThread(std::stop_token stop_token) {std::unique_lock lk{queue_mutex};// Wait for work.- Common::CondvarWait(event_cv, lk, stop_token, [&] { return TryPopQueue(work); });+ event_cv.wait(lk, stop_token, [&] { return TryPopQueue(work); });// If we've been asked to stop, we're done.if (stop_token.stop_requested()) {diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cppindex 04a51f2d1e..54183be12c 100644--- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp+++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -224,7 +227,7 @@ void TurboMode::Run(std::stop_token stop_token) {#endif// Wait for the next graphics queue submission if necessary.std::unique_lock lk{m_submission_lock};- Common::CondvarWait(m_submission_cv, lk, stop_token, [this] {+ m_submission_cv.wait(lk, stop_token, [this] {return (std::chrono::steady_clock::now() - m_submission_time) <=std::chrono::milliseconds{100};});diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cppindex 7b5f2a314f..cdc4e4024a 100644--- a/src/yuzu/bootmanager.cpp+++ b/src/yuzu/bootmanager.cpp@@ -108,13 +108,13 @@ void EmuThread::run() {m_system.Run();m_stopped.Reset();- Common::CondvarWait(m_should_run_cv, lk, stop_token, [&] { return !m_should_run; });+ m_should_run_cv.wait(lk, stop_token, [&] { return !m_should_run; });} else {m_system.Pause();m_stopped.Set();EmulationPaused(lk);- Common::CondvarWait(m_should_run_cv, lk, stop_token, [&] { return m_should_run; });+ m_should_run_cv.wait(lk, stop_token, [&] { return m_should_run; });EmulationResumed(lk);}}