summaryrefslogtreecommitdiffstats
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-02-10 04:17:20 +0100
committerbunnei <bunneidev@gmail.com>2015-02-10 04:17:20 +0100
commit848795f3834c30695208e86c5bbebf6c71a57d96 (patch)
tree2cc5b3092cf41215bac17c6ddaf3bdec985b7adb /src/core/hle/svc.cpp
parentMerge pull request #550 from lioncash/ftoui (diff)
parentMutex: Locks should be recursive. (diff)
downloadyuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar
yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.gz
yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.bz2
yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.lz
yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.xz
yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.zst
yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/svc.cpp8
1 files changed, 4 insertions, 4 deletions
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;
}