diff options
| author | bunnei <bunneidev@gmail.com> | 2017-01-06 22:01:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 22:01:33 -0500 |
| commit | b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2 (patch) | |
| tree | b5ec9f4c3d520745e15d249e9a102ddefbb22b27 | |
| parent | 59f4f1d7ff5fb7bbf436348f2e1e3d1f89f3256d (diff) | |
| parent | fc2266130b450952777cd3a9e47adb36960de8e7 (diff) | |
Merge pull request #2410 from Subv/sleepthread
Don't yield execution in SleepThread(0) if there are no available threads to run
| -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 cb9a93ee48..8c6fbcd04f 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 6d395585d4..c557a22797 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 843d697ec3..2b242ff981 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(); |