diff options
author | Fernando S <fsahmkow27@gmail.com> | 2022-04-16 00:05:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-16 00:05:04 +0200 |
commit | 34710065e84ccc3de4433b7dd0ffb569e14788b8 (patch) | |
tree | 5e96d11546befd9671dff252e8e9e8a693b0bd1a /src/core/core_timing.h | |
parent | Merge pull request #8190 from Docteh/palswap (diff) | |
parent | core: hle: kernel: k_thread: Rework dummy thread waiting. (diff) | |
download | yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.tar yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.tar.gz yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.tar.bz2 yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.tar.lz yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.tar.xz yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.tar.zst yuzu-34710065e84ccc3de4433b7dd0ffb569e14788b8.zip |
Diffstat (limited to 'src/core/core_timing.h')
-rw-r--r-- | src/core/core_timing.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 888828fd0..28b63be43 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -8,13 +8,13 @@ #include <chrono> #include <functional> #include <memory> +#include <mutex> #include <optional> #include <string> #include <thread> #include <vector> #include "common/common_types.h" -#include "common/spin_lock.h" #include "common/thread.h" #include "common/wall_clock.h" @@ -149,8 +149,8 @@ private: std::shared_ptr<EventType> ev_lost; Common::Event event{}; Common::Event pause_event{}; - Common::SpinLock basic_lock{}; - Common::SpinLock advance_lock{}; + std::mutex basic_lock; + std::mutex advance_lock; std::unique_ptr<std::thread> timer_thread; std::atomic<bool> paused{}; std::atomic<bool> paused_set{}; |