From caa58acc840efd6881e7816ad4fdb5d48c17e2e2 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 9 Feb 2015 22:05:39 -0500 Subject: WaitSynch: Always reschedule (verified behavior on hw). --- src/core/hle/svc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 34a27917f..c4866fcce 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -144,6 +144,8 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) { LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds); + HLE::Reschedule(__func__); + // Check for next thread to schedule if (object->ShouldWait()) { @@ -153,8 +155,6 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) { // Create an event to wake the thread up after the specified nanosecond delay has passed Kernel::GetCurrentThread()->WakeAfterDelay(nano_seconds); - HLE::Reschedule(__func__); - // NOTE: output of this SVC will be set later depending on how the thread resumes return RESULT_INVALID; } @@ -216,6 +216,8 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou } } + HLE::Reschedule(__func__); + // If thread should wait, then set its state to waiting and then reschedule... if (wait_thread) { @@ -229,8 +231,6 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou // Create an event to wake the thread up after the specified nanosecond delay has passed Kernel::GetCurrentThread()->WakeAfterDelay(nano_seconds); - HLE::Reschedule(__func__); - // NOTE: output of this SVC will be set later depending on how the thread resumes return RESULT_INVALID; } -- cgit v1.2.3