summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-02-12 21:26:31 +0100
committerLioncash <mathew1800@gmail.com>2020-02-12 21:34:07 +0100
commitbe269e21a53cb317534477657ca232bb3f51aa26 (patch)
tree0f20235a1d6d0c3f88daf21ac3bbc891e417d26b /src
parentaddress_arbiter: Simplify GetThreadsWaitingOnAddress() (diff)
downloadyuzu-be269e21a53cb317534477657ca232bb3f51aa26.tar
yuzu-be269e21a53cb317534477657ca232bb3f51aa26.tar.gz
yuzu-be269e21a53cb317534477657ca232bb3f51aa26.tar.bz2
yuzu-be269e21a53cb317534477657ca232bb3f51aa26.tar.lz
yuzu-be269e21a53cb317534477657ca232bb3f51aa26.tar.xz
yuzu-be269e21a53cb317534477657ca232bb3f51aa26.tar.zst
yuzu-be269e21a53cb317534477657ca232bb3f51aa26.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index a1287de93..8475b698c 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -201,31 +201,29 @@ void AddressArbiter::HandleWakeupThread(std::shared_ptr<Thread> thread) {
void AddressArbiter::InsertThread(std::shared_ptr<Thread> thread) {
const VAddr arb_addr = thread->GetArbiterWaitAddress();
std::list<std::shared_ptr<Thread>>& thread_list = arb_threads[arb_addr];
- auto it = thread_list.begin();
- while (it != thread_list.end()) {
- const std::shared_ptr<Thread>& current_thread = *it;
- if (current_thread->GetPriority() >= thread->GetPriority()) {
- thread_list.insert(it, thread);
- return;
- }
- ++it;
+
+ const auto iter =
+ std::find_if(thread_list.cbegin(), thread_list.cend(), [&thread](const auto& entry) {
+ return entry->GetPriority() >= thread->GetPriority();
+ });
+
+ if (iter == thread_list.cend()) {
+ thread_list.push_back(std::move(thread));
+ } else {
+ thread_list.insert(iter, std::move(thread));
}
- thread_list.push_back(std::move(thread));
}
void AddressArbiter::RemoveThread(std::shared_ptr<Thread> thread) {
const VAddr arb_addr = thread->GetArbiterWaitAddress();
std::list<std::shared_ptr<Thread>>& thread_list = arb_threads[arb_addr];
- auto it = thread_list.begin();
- while (it != thread_list.end()) {
- const std::shared_ptr<Thread>& current_thread = *it;
- if (current_thread.get() == thread.get()) {
- thread_list.erase(it);
- return;
- }
- ++it;
- }
- UNREACHABLE();
+
+ const auto iter = std::find_if(thread_list.cbegin(), thread_list.cend(),
+ [&thread](const auto& entry) { return thread == entry; });
+
+ ASSERT(iter != thread_list.cend());
+
+ thread_list.erase(iter);
}
std::vector<std::shared_ptr<Thread>> AddressArbiter::GetThreadsWaitingOnAddress(