diff options
author | Lioncash <mathew1800@gmail.com> | 2018-07-20 03:39:05 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-07-20 04:08:56 +0200 |
commit | dbfe82773d98fadac481cd9061f5eda98aebf308 (patch) | |
tree | ee1c5f480bcbf95339eff8677f061bbb57d8ee95 /src/core/hle/kernel/wait_object.cpp | |
parent | Merge pull request #726 from lioncash/overload (diff) | |
download | yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.tar yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.tar.gz yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.tar.bz2 yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.tar.lz yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.tar.xz yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.tar.zst yuzu-dbfe82773d98fadac481cd9061f5eda98aebf308.zip |
Diffstat (limited to 'src/core/hle/kernel/wait_object.cpp')
-rw-r--r-- | src/core/hle/kernel/wait_object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp index b08ac72c1..eb3c92e66 100644 --- a/src/core/hle/kernel/wait_object.cpp +++ b/src/core/hle/kernel/wait_object.cpp @@ -38,9 +38,9 @@ SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { for (const auto& thread : waiting_threads) { // The list of waiting threads must not contain threads that are not waiting to be awakened. - ASSERT_MSG(thread->status == THREADSTATUS_WAIT_SYNCH_ANY || - thread->status == THREADSTATUS_WAIT_SYNCH_ALL || - thread->status == THREADSTATUS_WAIT_HLE_EVENT, + ASSERT_MSG(thread->status == ThreadStatus::WaitSynchAny || + thread->status == ThreadStatus::WaitSynchAll || + thread->status == ThreadStatus::WaitHLEEvent, "Inconsistent thread statuses in waiting_threads"); if (thread->current_priority >= candidate_priority) @@ -49,10 +49,10 @@ SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { if (ShouldWait(thread.get())) continue; - // A thread is ready to run if it's either in THREADSTATUS_WAIT_SYNCH_ANY or - // in THREADSTATUS_WAIT_SYNCH_ALL and the rest of the objects it is waiting on are ready. + // A thread is ready to run if it's either in ThreadStatus::WaitSynchAny or + // in ThreadStatus::WaitSynchAll and the rest of the objects it is waiting on are ready. bool ready_to_run = true; - if (thread->status == THREADSTATUS_WAIT_SYNCH_ALL) { + if (thread->status == ThreadStatus::WaitSynchAll) { ready_to_run = std::none_of(thread->wait_objects.begin(), thread->wait_objects.end(), [&thread](const SharedPtr<WaitObject>& object) { return object->ShouldWait(thread.get()); |