diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-03-29 22:13:00 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-10-15 17:55:10 +0200 |
commit | b5d1e447821eb21158669e0ef1d24d630602f1fe (patch) | |
tree | 0889f7ee46ffe5ffd1880abbcd786c9adf2251bf /src/core/hle/kernel/address_arbiter.cpp | |
parent | Correct compiling errors and addapt to the new interface. (diff) | |
download | yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.tar yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.tar.gz yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.tar.bz2 yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.tar.lz yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.tar.xz yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.tar.zst yuzu-b5d1e447821eb21158669e0ef1d24d630602f1fe.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index c8842410b..77f7bb451 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -22,6 +22,8 @@ namespace Kernel { namespace { // Wake up num_to_wake (or all) threads in a vector. void WakeThreads(const std::vector<SharedPtr<Thread>>& waiting_threads, s32 num_to_wake) { + + auto& system = Core::System::GetInstance(); // Only process up to 'target' threads, unless 'target' is <= 0, in which case process // them all. std::size_t last = waiting_threads.size(); @@ -35,6 +37,8 @@ void WakeThreads(const std::vector<SharedPtr<Thread>>& waiting_threads, s32 num_ waiting_threads[i]->SetWaitSynchronizationResult(RESULT_SUCCESS); waiting_threads[i]->SetArbiterWaitAddress(0); waiting_threads[i]->ResumeFromWait(); + if (waiting_threads[i]->GetProcessorID() >= 0) + system.CpuCore(waiting_threads[i]->GetProcessorID()).PrepareReschedule(); } } } // Anonymous namespace @@ -174,25 +178,17 @@ ResultCode AddressArbiter::WaitForAddressImpl(VAddr address, s64 timeout) { } std::vector<SharedPtr<Thread>> AddressArbiter::GetThreadsWaitingOnAddress(VAddr address) const { - const auto RetrieveWaitingThreads = [this](std::size_t core_index, - std::vector<SharedPtr<Thread>>& waiting_threads, - VAddr arb_addr) { - const auto& scheduler = system.Scheduler(core_index); - const auto& thread_list = scheduler.GetThreadList(); - - for (const auto& thread : thread_list) { - if (thread->GetArbiterWaitAddress() == arb_addr) { - waiting_threads.push_back(thread); - } - } - }; // Retrieve all threads that are waiting for this address. std::vector<SharedPtr<Thread>> threads; - RetrieveWaitingThreads(0, threads, address); - RetrieveWaitingThreads(1, threads, address); - RetrieveWaitingThreads(2, threads, address); - RetrieveWaitingThreads(3, threads, address); + const auto& scheduler = system.GlobalScheduler(); + const auto& thread_list = scheduler.GetThreadList(); + + for (const auto& thread : thread_list) { + if (thread->GetArbiterWaitAddress() == address) { + threads.push_back(thread); + } + } // Sort them by priority, such that the highest priority ones come first. std::sort(threads.begin(), threads.end(), |