diff options
author | Subv <subv2112@gmail.com> | 2018-08-13 00:49:55 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-08-13 01:41:11 +0200 |
commit | 84b542c386063339c03069b8f4db8221200a27cd (patch) | |
tree | 458f04b71db6562257d1f5c1495433aaf70ce960 /src/core/hle/kernel | |
parent | Kernel/Thread: Always use the threadsafe option when scheduling wakeups. (diff) | |
download | yuzu-84b542c386063339c03069b8f4db8221200a27cd.tar yuzu-84b542c386063339c03069b8f4db8221200a27cd.tar.gz yuzu-84b542c386063339c03069b8f4db8221200a27cd.tar.bz2 yuzu-84b542c386063339c03069b8f4db8221200a27cd.tar.lz yuzu-84b542c386063339c03069b8f4db8221200a27cd.tar.xz yuzu-84b542c386063339c03069b8f4db8221200a27cd.tar.zst yuzu-84b542c386063339c03069b8f4db8221200a27cd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index e308b9c7b..5f87ff859 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -23,6 +23,7 @@ #include "core/hle/kernel/object.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/thread.h" +#include "core/hle/lock.h" #include "core/hle/result.h" #include "core/memory.h" @@ -104,6 +105,10 @@ void ExitCurrentThread() { */ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) { const auto proper_handle = static_cast<Handle>(thread_handle); + + // Lock the global kernel mutex when we enter the kernel HLE. + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); + SharedPtr<Thread> thread = wakeup_callback_handle_table.Get<Thread>(proper_handle); if (thread == nullptr) { LOG_CRITICAL(Kernel, "Callback fired for invalid thread {:08X}", proper_handle); |