diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index cb9a93ee488f8e34a0c6237406be301e63d31309..8c6fbcd04f39785ff71d52f260851152db726a51 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -508,6 +508,10 @@ SharedPtr<Thread> 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 6d395585d461a9e0f550453c877ef1b07e5755c8..c557a227975ea97b5026889c59692d5f9e2d194f 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -218,6 +218,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) */ diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 843d697ec315fb3b284a8ec7977a94e83df41871..2b242ff981e2d9d9edf055c4dca27270de4f7984 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();