diff options
| author | 2020-12-28 20:41:01 -0800 | |
|---|---|---|
| committer | 2021-01-11 14:23:16 -0800 | |
| commit | f12701b303dc5b994f9969db21cf1c319e94bdf3 (patch) | |
| tree | 1391aaed28726d5573851d7480deb2d8d4941339 /src/core | |
| parent | hle: kernel: Rename thread "status" to "state". (diff) | |
| download | yuzu-f12701b303dc5b994f9969db21cf1c319e94bdf3.tar.gz yuzu-f12701b303dc5b994f9969db21cf1c319e94bdf3.tar.xz yuzu-f12701b303dc5b994f9969db21cf1c319e94bdf3.zip | |
hle: kernel: k_scheduler: Cleanup OnThreadPriorityChanged.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/k_scheduler.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_scheduler.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index cdcb89f68..42f0ea483 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp | |||
| @@ -203,9 +203,7 @@ void KScheduler::OnThreadStateChanged(KernelCore& kernel, Thread* thread, Thread | |||
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | void KScheduler::OnThreadPriorityChanged(KernelCore& kernel, Thread* thread, Thread* current_thread, | 206 | void KScheduler::OnThreadPriorityChanged(KernelCore& kernel, Thread* thread, s32 old_priority) { |
| 207 | s32 old_priority) { | ||
| 208 | |||
| 209 | ASSERT(kernel.GlobalSchedulerContext().IsLocked()); | 207 | ASSERT(kernel.GlobalSchedulerContext().IsLocked()); |
| 210 | 208 | ||
| 211 | // If the thread is runnable, we want to change its priority in the queue. | 209 | // If the thread is runnable, we want to change its priority in the queue. |
| @@ -292,7 +290,7 @@ void KScheduler::RotateScheduledQueue(s32 core_id, s32 priority) { | |||
| 292 | 290 | ||
| 293 | // If the best thread we can choose has a priority the same or worse than ours, try to | 291 | // If the best thread we can choose has a priority the same or worse than ours, try to |
| 294 | // migrate a higher priority thread. | 292 | // migrate a higher priority thread. |
| 295 | if (best_thread != nullptr && best_thread->GetPriority() >= static_cast<u32>(priority)) { | 293 | if (best_thread != nullptr && best_thread->GetPriority() >= priority) { |
| 296 | Thread* suggested = priority_queue.GetSuggestedFront(core_id); | 294 | Thread* suggested = priority_queue.GetSuggestedFront(core_id); |
| 297 | while (suggested != nullptr) { | 295 | while (suggested != nullptr) { |
| 298 | // If the suggestion's priority is the same as ours, don't bother. | 296 | // If the suggestion's priority is the same as ours, don't bother. |
diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index 677375d1a..783665123 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h | |||
| @@ -103,8 +103,7 @@ public: | |||
| 103 | static void OnThreadStateChanged(KernelCore& kernel, Thread* thread, ThreadState old_state); | 103 | static void OnThreadStateChanged(KernelCore& kernel, Thread* thread, ThreadState old_state); |
| 104 | 104 | ||
| 105 | /// Notify the scheduler a thread's priority has changed. | 105 | /// Notify the scheduler a thread's priority has changed. |
| 106 | static void OnThreadPriorityChanged(KernelCore& kernel, Thread* thread, Thread* current_thread, | 106 | static void OnThreadPriorityChanged(KernelCore& kernel, Thread* thread, s32 old_priority); |
| 107 | s32 old_priority); | ||
| 108 | 107 | ||
| 109 | /// Notify the scheduler a thread's core and/or affinity mask has changed. | 108 | /// Notify the scheduler a thread's core and/or affinity mask has changed. |
| 110 | static void OnThreadAffinityMaskChanged(KernelCore& kernel, Thread* thread, | 109 | static void OnThreadAffinityMaskChanged(KernelCore& kernel, Thread* thread, |