diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-02-27 03:26:53 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-06-27 17:35:17 +0200 |
commit | d4ebb510a05d29befde6556e632413e5b35b9ab5 (patch) | |
tree | 309755a4ef21b48f12cca6c40798dccd191cf860 /src/core/hle/kernel/time_manager.cpp | |
parent | SVC: Cleanup old methods. (diff) | |
download | yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.tar yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.tar.gz yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.tar.bz2 yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.tar.lz yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.tar.xz yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.tar.zst yuzu-d4ebb510a05d29befde6556e632413e5b35b9ab5.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/time_manager.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/core/hle/kernel/time_manager.cpp b/src/core/hle/kernel/time_manager.cpp index 0b8f0d993..dab5fc4c6 100644 --- a/src/core/hle/kernel/time_manager.cpp +++ b/src/core/hle/kernel/time_manager.cpp @@ -8,15 +8,21 @@ #include "core/core_timing_util.h" #include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/thread.h" #include "core/hle/kernel/time_manager.h" namespace Kernel { -TimeManager::TimeManager(Core::System& system) : system{system} { +TimeManager::TimeManager(Core::System& system_) : system{system_} { time_manager_event_type = Core::Timing::CreateEvent( "Kernel::TimeManagerCallback", [this](u64 thread_handle, [[maybe_unused]] s64 cycles_late) { + SchedulerLock lock(system.Kernel()); Handle proper_handle = static_cast<Handle>(thread_handle); + if (cancelled_events[proper_handle]) { + return; + } + event_fired[proper_handle] = true; std::shared_ptr<Thread> thread = this->system.Kernel().RetrieveThreadFromGlobalHandleTable(proper_handle); thread->OnWakeUp(); @@ -24,14 +30,16 @@ TimeManager::TimeManager(Core::System& system) : system{system} { } void TimeManager::ScheduleTimeEvent(Handle& event_handle, Thread* timetask, s64 nanoseconds) { + event_handle = timetask->GetGlobalHandle(); if (nanoseconds > 0) { ASSERT(timetask); - event_handle = timetask->GetGlobalHandle(); const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); system.CoreTiming().ScheduleEvent(cycles, time_manager_event_type, event_handle); } else { event_handle = InvalidHandle; } + cancelled_events[event_handle] = false; + event_fired[event_handle] = false; } void TimeManager::UnscheduleTimeEvent(Handle event_handle) { @@ -39,6 +47,12 @@ void TimeManager::UnscheduleTimeEvent(Handle event_handle) { return; } system.CoreTiming().UnscheduleEvent(time_manager_event_type, event_handle); + cancelled_events[event_handle] = true; +} + +void TimeManager::CancelTimeEvent(Thread* time_task) { + Handle event_handle = time_task->GetGlobalHandle(); + UnscheduleTimeEvent(event_handle); } } // namespace Kernel |