lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-29 06:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: avoid racy behavior in global suspension

Browse source
This commit is contained in:
Liam 2022-11-02 20:08:19 -04:00
parent 9fc1bcc7b2
commit 85527cc7c7
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/core/hle/kernel/kernel.cpp
View file

@ -1109,17 +1109,29 @@ void KernelCore::Suspend(bool suspended) {
const bool should_suspend{exception_exited || suspended};
const auto activity = should_suspend ? ProcessActivity::Paused : ProcessActivity::Runnable;
for (auto* process : GetProcessList()) {
std::vector<KScopedAutoObject<KThread>> process_threads;
{
KScopedSchedulerLock sl{*this};
if (auto* process = CurrentProcess(); process != nullptr) {
process->SetActivity(activity);
if (should_suspend) {
// Wait for execution to stop
if (!should_suspend) {
// Runnable now; no need to wait.
return;
}
for (auto* thread : process->GetThreadList()) {
process_threads.emplace_back(thread);
}
}
}
// Wait for execution to stop.
for (auto& thread : process_threads) {
thread->WaitUntilSuspended();
}
}
}
}
void KernelCore::ShutdownCores() {
KScopedSchedulerLock lk{*this};