diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-11-15 01:13:18 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-11-21 15:46:55 +0100 |
commit | 2d16507f9fa06e868349d6f57a78585aec8628fd (patch) | |
tree | 7931e2bb9db6d55e7be760f1a1dcff14de09db78 /src/core/hle/kernel/svc.cpp | |
parent | Merge pull request #3142 from ReinUsesLisp/depbar-log (diff) | |
download | yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.tar yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.tar.gz yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.tar.bz2 yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.tar.lz yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.tar.xz yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.tar.zst yuzu-2d16507f9fa06e868349d6f57a78585aec8628fd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c63a9ba8b..c27529f4d 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -1626,6 +1626,7 @@ static ResultCode WaitProcessWideKeyAtomic(Core::System& system, VAddr mutex_add current_thread->SetWaitHandle(thread_handle); current_thread->SetStatus(ThreadStatus::WaitCondVar); current_thread->InvalidateWakeupCallback(); + current_process->InsertConditionVariableThread(current_thread); current_thread->WakeAfterDelay(nano_seconds); @@ -1644,21 +1645,9 @@ static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_var ASSERT(condition_variable_addr == Common::AlignDown(condition_variable_addr, 4)); // Retrieve a list of all threads that are waiting for this condition variable. - std::vector<SharedPtr<Thread>> waiting_threads; - const auto& scheduler = system.GlobalScheduler(); - const auto& thread_list = scheduler.GetThreadList(); - - for (const auto& thread : thread_list) { - if (thread->GetCondVarWaitAddress() == condition_variable_addr) { - waiting_threads.push_back(thread); - } - } - - // Sort them by priority, such that the highest priority ones come first. - std::sort(waiting_threads.begin(), waiting_threads.end(), - [](const SharedPtr<Thread>& lhs, const SharedPtr<Thread>& rhs) { - return lhs->GetPriority() < rhs->GetPriority(); - }); + auto* const current_process = system.Kernel().CurrentProcess(); + std::vector<SharedPtr<Thread>> waiting_threads = + current_process->GetConditionVariableThreads(condition_variable_addr); // Only process up to 'target' threads, unless 'target' is -1, in which case process // them all. @@ -1677,6 +1666,7 @@ static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_var // liberate Cond Var Thread. thread->SetCondVarWaitAddress(0); + current_process->RemoveConditionVariableThread(thread); const std::size_t current_core = system.CurrentCoreIndex(); auto& monitor = system.Monitor(); |