summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-01-07 04:01:33 +0100
committerGitHub <noreply@github.com>2017-01-07 04:01:33 +0100
commitb5eac78b43c254b20ef88386b4fdaf0bb6c29fe2 (patch)
treeb5ec9f4c3d520745e15d249e9a102ddefbb22b27
parentMerge pull request #2396 from Subv/sema_acquire (diff)
parentKernel: Don't attempt to yield execution in SleepThread(0) if there are no available threads to run. (diff)
downloadyuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar
yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.gz
yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.bz2
yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.lz
yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.xz
yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.zst
yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.zip
-rw-r--r--src/core/hle/kernel/thread.cpp4
-rw-r--r--src/core/hle/kernel/thread.h5
-rw-r--r--src/core/hle/svc.cpp5
3 files changed, 14 insertions, 0 deletions
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<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 6d395585d..c557a2279 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 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();