OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-26 05:20:06 +00:00
Code Issues Projects Releases Wiki Activity

kernel: time_manager: Protect access with a mutex.

Browse Source
This commit is contained in:
bunnei 2020-11-18 16:19:00 -08:00
parent 24cae76d16
commit b7ef581c6e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ TimeManager::TimeManager(Core::System& system_) : system{system_} {
}
void TimeManager::ScheduleTimeEvent(Handle& event_handle, Thread* timetask, s64 nanoseconds) {
std::lock_guard lock{mutex};
event_handle = timetask->GetGlobalHandle();
if (nanoseconds > 0) {
ASSERT(timetask);
@ -46,6 +47,7 @@ void TimeManager::ScheduleTimeEvent(Handle& event_handle, Thread* timetask, s64
}
void TimeManager::UnscheduleTimeEvent(Handle event_handle) {
std::lock_guard lock{mutex};
if (event_handle == InvalidHandle) {
return;
}
@ -54,7 +56,7 @@ void TimeManager::UnscheduleTimeEvent(Handle event_handle) {
}
void TimeManager::CancelTimeEvent(Thread* time_task) {
Handle event_handle = time_task->GetGlobalHandle();
const Handle event_handle = time_task->GetGlobalHandle();
UnscheduleTimeEvent(event_handle);
}

2
src/core/hle/kernel/time_manager.h
View File

@ -5,6 +5,7 @@
#pragma once
#include <memory>
#include <mutex>
#include <unordered_map>
#include "core/hle/kernel/object.h"
@ -42,6 +43,7 @@ private:
Core::System& system;
std::shared_ptr<Core::Timing::EventType> time_manager_event_type;
std::unordered_map<Handle, bool> cancelled_events;
std::mutex mutex;
};
} // namespace Kernel