diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index cb9a93ee4..8c6fbcd04 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -508,6 +508,10 @@ SharedPtr SetupMainThread(u32 entry_point, s32 priority) { return thread; } +bool HaveReadyThreads() { + return ready_queue.get_first() != nullptr; +} + void Reschedule() { Thread* cur = GetCurrentThread(); Thread* next = PopNextReadyThread(); diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 6d395585d..c557a2279 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -218,6 +218,11 @@ private: */ SharedPtr 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) */ diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 843d697ec..2b242ff98 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();