diff options
| author | 2016-12-14 12:13:02 -0500 | |
|---|---|---|
| committer | 2016-12-14 12:35:01 -0500 | |
| commit | 5b1edc6ae70972d4a11eee1f1ff8fdff2122b5a2 (patch) | |
| tree | b6fbcc194effc5e05a608ebde0ea3c887720d920 /src/core/hle/kernel/kernel.cpp | |
| parent | Properly remove a thread from its wait_objects' waitlist when it is awoken by... (diff) | |
| download | yuzu-5b1edc6ae70972d4a11eee1f1ff8fdff2122b5a2.tar.gz yuzu-5b1edc6ae70972d4a11eee1f1ff8fdff2122b5a2.tar.xz yuzu-5b1edc6ae70972d4a11eee1f1ff8fdff2122b5a2.zip | |
Fixed the codestyle to match our clang-format rules.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 2ddeffcdd..209d35270 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -50,9 +50,9 @@ SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { | |||
| 50 | if (thread->current_priority >= candidate_priority) | 50 | if (thread->current_priority >= candidate_priority) |
| 51 | continue; | 51 | continue; |
| 52 | 52 | ||
| 53 | bool ready_to_run = std::none_of(thread->wait_objects.begin(), thread->wait_objects.end(), [](const SharedPtr<WaitObject>& object) { | 53 | bool ready_to_run = |
| 54 | return object->ShouldWait(); | 54 | std::none_of(thread->wait_objects.begin(), thread->wait_objects.end(), |
| 55 | }); | 55 | [](const SharedPtr<WaitObject>& object) { return object->ShouldWait(); }); |
| 56 | if (ready_to_run) { | 56 | if (ready_to_run) { |
| 57 | candidate = thread.get(); | 57 | candidate = thread.get(); |
| 58 | candidate_priority = thread->current_priority; | 58 | candidate_priority = thread->current_priority; |
| @@ -83,7 +83,8 @@ void WaitObject::WakeupAllWaitingThreads() { | |||
| 83 | 83 | ||
| 84 | thread->SetWaitSynchronizationResult(RESULT_SUCCESS); | 84 | thread->SetWaitSynchronizationResult(RESULT_SUCCESS); |
| 85 | thread->ResumeFromWait(); | 85 | thread->ResumeFromWait(); |
| 86 | // Note: Removing the thread from the object's waitlist will be done by GetHighestPriorityReadyThread | 86 | // Note: Removing the thread from the object's waitlist will be |
| 87 | // done by GetHighestPriorityReadyThread. | ||
| 87 | } | 88 | } |
| 88 | } | 89 | } |
| 89 | 90 | ||