diff options
| author | 2022-04-07 16:01:26 -0700 | |
|---|---|---|
| committer | 2022-04-11 21:13:40 -0700 | |
| commit | 8deaac8bd1707f56f29d61e427ad53964a0920fd (patch) | |
| tree | d17e4ed20b9249507ad587aa0eb82e277daff614 /src/core/core_timing.h | |
| parent | Merge pull request #8157 from lat9nq/kernel-races (diff) | |
| download | yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.gz yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.tar.xz yuzu-8deaac8bd1707f56f29d61e427ad53964a0920fd.zip | |
hle: kernel: Use std::mutex instead of spin locks for most kernel locking.
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 @@ | |||
| 8 | #include <chrono> | 8 | #include <chrono> |
| 9 | #include <functional> | 9 | #include <functional> |
| 10 | #include <memory> | 10 | #include <memory> |
| 11 | #include <mutex> | ||
| 11 | #include <optional> | 12 | #include <optional> |
| 12 | #include <string> | 13 | #include <string> |
| 13 | #include <thread> | 14 | #include <thread> |
| 14 | #include <vector> | 15 | #include <vector> |
| 15 | 16 | ||
| 16 | #include "common/common_types.h" | 17 | #include "common/common_types.h" |
| 17 | #include "common/spin_lock.h" | ||
| 18 | #include "common/thread.h" | 18 | #include "common/thread.h" |
| 19 | #include "common/wall_clock.h" | 19 | #include "common/wall_clock.h" |
| 20 | 20 | ||
| @@ -149,8 +149,8 @@ private: | |||
| 149 | std::shared_ptr<EventType> ev_lost; | 149 | std::shared_ptr<EventType> ev_lost; |
| 150 | Common::Event event{}; | 150 | Common::Event event{}; |
| 151 | Common::Event pause_event{}; | 151 | Common::Event pause_event{}; |
| 152 | Common::SpinLock basic_lock{}; | 152 | std::mutex basic_lock; |
| 153 | Common::SpinLock advance_lock{}; | 153 | std::mutex advance_lock; |
| 154 | std::unique_ptr<std::thread> timer_thread; | 154 | std::unique_ptr<std::thread> timer_thread; |
| 155 | std::atomic<bool> paused{}; | 155 | std::atomic<bool> paused{}; |
| 156 | std::atomic<bool> paused_set{}; | 156 | std::atomic<bool> paused_set{}; |