diff options
| author | 2017-01-06 22:01:33 -0500 | |
|---|---|---|
| committer | 2017-01-06 22:01:33 -0500 | |
| commit | b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2 (patch) | |
| tree | b5ec9f4c3d520745e15d249e9a102ddefbb22b27 /src/core/hle/kernel | |
| parent | Merge pull request #2396 from Subv/sema_acquire (diff) | |
| parent | Kernel: Don't attempt to yield execution in SleepThread(0) if there are no av... (diff) | |
| download | yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.gz yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.tar.xz yuzu-b5eac78b43c254b20ef88386b4fdaf0bb6c29fe2.zip | |
Merge pull request #2410 from Subv/sleepthread
Don't yield execution in SleepThread(0) if there are no available threads to run
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 5 |
2 files changed, 9 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) { | |||
| 508 | return thread; | 508 | return thread; |
| 509 | } | 509 | } |
| 510 | 510 | ||
| 511 | bool HaveReadyThreads() { | ||
| 512 | return ready_queue.get_first() != nullptr; | ||
| 513 | } | ||
| 514 | |||
| 511 | void Reschedule() { | 515 | void Reschedule() { |
| 512 | Thread* cur = GetCurrentThread(); | 516 | Thread* cur = GetCurrentThread(); |
| 513 | Thread* next = PopNextReadyThread(); | 517 | 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: | |||
| 219 | SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority); | 219 | SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority); |
| 220 | 220 | ||
| 221 | /** | 221 | /** |
| 222 | * Returns whether there are any threads that are ready to run. | ||
| 223 | */ | ||
| 224 | bool HaveReadyThreads(); | ||
| 225 | |||
| 226 | /** | ||
| 222 | * Reschedules to the next available thread (call after current thread is suspended) | 227 | * Reschedules to the next available thread (call after current thread is suspended) |
| 223 | */ | 228 | */ |
| 224 | void Reschedule(); | 229 | void Reschedule(); |