diff options
author | Subv <subv2112@gmail.com> | 2017-01-05 20:14:22 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2017-01-06 01:11:34 +0100 |
commit | fc2266130b450952777cd3a9e47adb36960de8e7 (patch) | |
tree | 98c4540c61e35fb29e1572583bd54a6dee080c22 /src | |
parent | Merge pull request #2393 from Subv/synch (diff) | |
download | yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.tar yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.tar.gz yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.tar.bz2 yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.tar.lz yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.tar.xz yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.tar.zst yuzu-fc2266130b450952777cd3a9e47adb36960de8e7.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.h | 5 | ||||
-rw-r--r-- | src/core/hle/svc.cpp | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 9109bd10b..6cd9ff327 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -556,6 +556,10 @@ SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) { return thread; } +bool HaveReadyThreads() { + return ready_queue.get_first() != nullptr; +} + void Reschedule() { PriorityBoostStarvedThreads(); diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index af72b76ea..13a29a044 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -219,6 +219,11 @@ private: SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority); /** + * Returns whether there are any threads that are ready to run. + */ +bool HaveReadyThreads(); + +/** * Reschedules to the next available thread (call after current thread is suspended) */ void Reschedule(); diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 855f3af82..50d35ab97 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -849,6 +849,11 @@ static ResultCode CancelTimer(Kernel::Handle handle) { static void SleepThread(s64 nanoseconds) { LOG_TRACE(Kernel_SVC, "called nanoseconds=%lld", nanoseconds); + // Don't attempt to yield execution if there are no available threads to run, + // this way we avoid a useless reschedule to the idle thread. + if (nanoseconds == 0 && !Kernel::HaveReadyThreads()) + return; + // Sleep current thread and check for next thread to schedule Kernel::WaitCurrentThread_Sleep(); |