diff options
author | bunnei <bunneidev@gmail.com> | 2019-06-30 18:54:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-30 18:54:00 +0200 |
commit | d992909636269cde90cf6cb3749ccffcff9a6c56 (patch) | |
tree | 9dd14057dab85c1ba171df75f2112697cdc85cb6 /src/core/hle/kernel | |
parent | Merge pull request #2653 from FearlessTobi/revert-2474-patch-1 (diff) | |
parent | Core_Timing: Make core_timing threadsafe by default. (diff) | |
download | yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.tar yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.tar.gz yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.tar.bz2 yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.tar.lz yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.tar.xz yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.tar.zst yuzu-d992909636269cde90cf6cb3749ccffcff9a6c56.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index c73a40977..a055a5002 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -76,13 +76,13 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { // This function might be called from any thread so we have to be cautious and use the // thread-safe version of ScheduleEvent. const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); - Core::System::GetInstance().CoreTiming().ScheduleEventThreadsafe( + Core::System::GetInstance().CoreTiming().ScheduleEvent( cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle); } void Thread::CancelWakeupTimer() { - Core::System::GetInstance().CoreTiming().UnscheduleEventThreadsafe( - kernel.ThreadWakeupCallbackEventType(), callback_handle); + Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), + callback_handle); } static std::optional<s32> GetNextProcessorId(u64 mask) { |