summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-12-03 21:56:02 -0800
committerGravatar bunnei2020-12-06 00:03:24 -0800
commit4756cb203e8ef09377988eb1b49ca20ef45f4492 (patch)
tree69aed28dbf048dea702665e68797f14c20650276 /src/core/hle/kernel/svc.cpp
parenthle: kernel: Separate KScheduler from GlobalSchedulerContext class. (diff)
downloadyuzu-4756cb203e8ef09377988eb1b49ca20ef45f4492.tar.gz
yuzu-4756cb203e8ef09377988eb1b49ca20ef45f4492.tar.xz
yuzu-4756cb203e8ef09377988eb1b49ca20ef45f4492.zip
hle: kernel: Separate KScopedSchedulerLockAndSleep from k_scheduler.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 2612a6b0d..2760a307c 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -25,6 +25,7 @@
25#include "core/hle/kernel/errors.h" 25#include "core/hle/kernel/errors.h"
26#include "core/hle/kernel/handle_table.h" 26#include "core/hle/kernel/handle_table.h"
27#include "core/hle/kernel/k_scheduler.h" 27#include "core/hle/kernel/k_scheduler.h"
28#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
28#include "core/hle/kernel/kernel.h" 29#include "core/hle/kernel/kernel.h"
29#include "core/hle/kernel/memory/memory_block.h" 30#include "core/hle/kernel/memory/memory_block.h"
30#include "core/hle/kernel/memory/page_table.h" 31#include "core/hle/kernel/memory/page_table.h"
@@ -1654,7 +1655,7 @@ static ResultCode WaitProcessWideKeyAtomic(Core::System& system, VAddr mutex_add
1654 Thread* current_thread = kernel.CurrentScheduler()->GetCurrentThread(); 1655 Thread* current_thread = kernel.CurrentScheduler()->GetCurrentThread();
1655 auto* const current_process = kernel.CurrentProcess(); 1656 auto* const current_process = kernel.CurrentProcess();
1656 { 1657 {
1657 SchedulerLockAndSleep lock(kernel, event_handle, current_thread, nano_seconds); 1658 KScopedSchedulerLockAndSleep lock(kernel, event_handle, current_thread, nano_seconds);
1658 const auto& handle_table = current_process->GetHandleTable(); 1659 const auto& handle_table = current_process->GetHandleTable();
1659 std::shared_ptr<Thread> thread = handle_table.Get<Thread>(thread_handle); 1660 std::shared_ptr<Thread> thread = handle_table.Get<Thread>(thread_handle);
1660 ASSERT(thread); 1661 ASSERT(thread);