diff options
| author |  bunnei | 2020-09-11 23:23:53 -0700 |
|---|---|---|
| committer |  GitHub | 2020-09-11 23:23:53 -0700 |
| commit | 5fc6bf96d8499c9fe436a29f71a90865dd4e8397 (patch) | |
| tree | 932c63cc1537e3b2ec5cf6e9e9f2c9607cff9001 | |
| parent | Merge pull request #4645 from v1993/lgtm-less-packages (diff) | |
| parent | kernel/scheduler: Use std::mutex instead of spin lock (diff) | |
| download | yuzu-5fc6bf96d8499c9fe436a29f71a90865dd4e8397.tar.gz yuzu-5fc6bf96d8499c9fe436a29f71a90865dd4e8397.tar.xz yuzu-5fc6bf96d8499c9fe436a29f71a90865dd4e8397.zip | |
Merge pull request #4323 from ReinUsesLisp/no-spin
kernel/scheduler: Use std::mutex instead of spin lock
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/scheduler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/scheduler.h b/src/core/hle/kernel/scheduler.h index 36e3c26fb..b6f04dcea 100644 --- a/src/core/hle/kernel/scheduler.h +++ b/src/core/hle/kernel/scheduler.h | |||
| @@ -188,7 +188,7 @@ private: | |||
| 188 | 188 | ||
| 189 | /// Scheduler lock mechanisms. | 189 | /// Scheduler lock mechanisms. |
| 190 | bool is_locked{}; | 190 | bool is_locked{}; |
| 191 | Common::SpinLock inner_lock{}; | 191 | std::mutex inner_lock; |
| 192 | std::atomic<s64> scope_lock{}; | 192 | std::atomic<s64> scope_lock{}; |
| 193 | Core::EmuThreadHandle current_owner{Core::EmuThreadHandle::InvalidHandle()}; | 193 | Core::EmuThreadHandle current_owner{Core::EmuThreadHandle::InvalidHandle()}; |
| 194 | 194 | ||