mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-09 21:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

System.cpp: Do not hold the watchdog forever for PPU LLVM compilation cancel

Browse Source 
Protects against the case in which the LLVM workers deadlock themselves.
This commit is contained in:
Eladash 2023-06-29 10:42:44 +03:00 committed by Ivan
parent 363e498462
commit f87db1ac14
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpcs3/Emu/System.cpp
View File

@ -2606,13 +2606,20 @@ void Emulator::Kill(bool allow_autoexit, bool savestate)
{ {
const auto closed_sucessfully = std::make_shared<atomic_t<bool>>(false); const auto closed_sucessfully = std::make_shared<atomic_t<bool>>(false);
bool is_being_held_longer = false;
for (int i = 0; thread_ctrl::state() != thread_state::aborting;) for (int i = 0; thread_ctrl::state() != thread_state::aborting;)
{ {
if (g_watchdog_hold_ctr)
{
is_being_held_longer = true;
}
// We don't need accurate timekeeping, using clocks may interfere with debugging // We don't need accurate timekeeping, using clocks may interfere with debugging
if (i >= 2000) if (i >= (is_being_held_longer ? 5000 : 2000))
{ {
// Total amount of waiting: about 10s // Total amount of waiting: about 10s
GetCallbacks().on_emulation_stop_no_response(closed_sucessfully, 10); GetCallbacks().on_emulation_stop_no_response(closed_sucessfully, is_being_held_longer ? 25 : 10);
while (thread_ctrl::state() != thread_state::aborting) while (thread_ctrl::state() != thread_state::aborting)
{ {
@ -2623,12 +2630,6 @@ void Emulator::Kill(bool allow_autoexit, bool savestate)
} }
thread_ctrl::wait_for(5'000); thread_ctrl::wait_for(5'000);
if (!g_watchdog_hold_ctr)
{
// Don't count if there are still uninterruptable threads like PPU LLVM workers
i++;
}
} }
*closed_sucessfully = true; *closed_sucessfully = true;