Cool_Tools/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: time_manager: Add missing lock guards.

Browse Source
This commit is contained in:
bunnei 2020-12-03 22:43:35 -08:00
parent ccce6cb3be
commit b9b7e4f915
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/kernel/time_manager.cpp
View File

@ -20,10 +20,16 @@ TimeManager::TimeManager(Core::System& system_) : system{system_} {
[this](std::uintptr_t thread_handle, std::chrono::nanoseconds) { [this](std::uintptr_t thread_handle, std::chrono::nanoseconds) {
const KScopedSchedulerLock lock(system.Kernel()); const KScopedSchedulerLock lock(system.Kernel());
const auto proper_handle = static_cast<Handle>(thread_handle); const auto proper_handle = static_cast<Handle>(thread_handle);
if (cancelled_events[proper_handle]) {
return; std::shared_ptr<Thread> thread;
{
std::lock_guard lock{mutex};
if (cancelled_events[proper_handle]) {
return;
}
thread = system.Kernel().RetrieveThreadFromGlobalHandleTable(proper_handle);
} }
auto thread = this->system.Kernel().RetrieveThreadFromGlobalHandleTable(proper_handle);
if (thread) { if (thread) {
// Thread can be null if process has exited // Thread can be null if process has exited
thread->OnWakeUp(); thread->OnWakeUp();
@ -56,6 +62,7 @@ void TimeManager::UnscheduleTimeEvent(Handle event_handle) {
} }
void TimeManager::CancelTimeEvent(Thread* time_task) { void TimeManager::CancelTimeEvent(Thread* time_task) {
std::lock_guard lock{mutex};
const Handle event_handle = time_task->GetGlobalHandle(); const Handle event_handle = time_task->GetGlobalHandle();
UnscheduleTimeEvent(event_handle); UnscheduleTimeEvent(event_handle);
} }