瀏覽代碼

Kernel: Don't attempt to yield execution in SleepThread(0) if there are no available threads to run.

With this we avoid an useless temporary deschedule of the current thread.
Subv 9 年之前
父節點
當前提交
fc2266130b
共有 3 個文件被更改,包括 14 次插入0 次删除
  1. 4 0
      src/core/hle/kernel/thread.cpp
  2. 5 0
      src/core/hle/kernel/thread.h
  3. 5 0
      src/core/hle/svc.cpp

+ 4 - 0
src/core/hle/kernel/thread.cpp

@@ -556,6 +556,10 @@ SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) {
     return thread;
     return thread;
 }
 }
 
 
+bool HaveReadyThreads() {
+    return ready_queue.get_first() != nullptr;
+}
+
 void Reschedule() {
 void Reschedule() {
     PriorityBoostStarvedThreads();
     PriorityBoostStarvedThreads();
 
 

+ 5 - 0
src/core/hle/kernel/thread.h

@@ -218,6 +218,11 @@ private:
  */
  */
 SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority);
 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)
  * Reschedules to the next available thread (call after current thread is suspended)
  */
  */

+ 5 - 0
src/core/hle/svc.cpp

@@ -849,6 +849,11 @@ static ResultCode CancelTimer(Kernel::Handle handle) {
 static void SleepThread(s64 nanoseconds) {
 static void SleepThread(s64 nanoseconds) {
     LOG_TRACE(Kernel_SVC, "called nanoseconds=%lld", 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
     // Sleep current thread and check for next thread to schedule
     Kernel::WaitCurrentThread_Sleep();
     Kernel::WaitCurrentThread_Sleep();