archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Emu: Track game termination progress better
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Waiting to run
Details
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Details

Browse source
This commit is contained in:
elad335 2025-05-08 13:22:35 +03:00 • committed by Elad
parent 4840e3575b
commit 3ea3ed6672
1 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

39
rpcs3/Emu/System.cpp
View file

@ -2953,10 +2953,11 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
auto perform_kill = [read_counter, allow_autoexit, this, info = GetEmulationIdentifier()]() auto perform_kill = [read_counter, allow_autoexit, this, info = GetEmulationIdentifier()]()
{ {
bool read_sysutil_signal = false; bool read_sysutil_signal = false;
std::vector<stx::shared_ptr<named_thread<ppu_thread>>> ppu_thread_list;
// If EXITGAME signal is not read, force kill after a couple of seconds. // If EXITGAME signal is not read, force kill after a second.
constexpr int loop_timeout_ms = 50; constexpr int loop_timeout_ms = 50;
int kill_timeout_ms = 2000; int kill_timeout_ms = 1000;
int elapsed_ms = 0; int elapsed_ms = 0;
qt_events_aware_op(loop_timeout_ms, [&]() qt_events_aware_op(loop_timeout_ms, [&]()
@ -2978,18 +2979,50 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
sys_log.notice("The game received the exit request. Waiting for it to terminate itself..."); sys_log.notice("The game received the exit request. Waiting for it to terminate itself...");
kill_timeout_ms += 5000; // Grant a couple more seconds kill_timeout_ms += 5000; // Grant a couple more seconds
read_sysutil_signal = true; read_sysutil_signal = true;
// Observe PPU threads state since this stage
idm::select<named_thread<ppu_thread>>([&](u32 id, cpu_thread&)
{
ppu_thread_list.emplace_back(idm::get_unlocked<named_thread<ppu_thread>>(id));
});
} }
if (static_cast<u64>(info) != m_stop_ctr) if (static_cast<u64>(info) != m_stop_ctr || Emu.IsStopped())
{ {
return true; return true;
} }
if (read_sysutil_signal && kill_timeout_ms - elapsed_ms <= 1'500)
{
int thread_exited_count = 0;
for (auto& ppu : ppu_thread_list)
{
if (ppu && (ppu->state & cpu_flag::exit || ppu->joiner == ppu_join_status::zombie))
{
ppu.reset();
thread_exited_count++;
}
}
if (thread_exited_count)
{
// If some threads exited since last check, grant additional 250 miliseconds
kill_timeout_ms += 250;
sys_log.notice("Threads were terminated.. increasing termination timeout (threads=%d)", thread_exited_count);
}
}
// Process events // Process events
elapsed_ms += loop_timeout_ms; elapsed_ms += loop_timeout_ms;
return false; return false;
}); });
if (Emu.IsStopped(true))
{
return;
}
// An inevitable attempt to terminate the *current* emulation course will be issued after the timeout was reached. // An inevitable attempt to terminate the *current* emulation course will be issued after the timeout was reached.
CallFromMainThread([this, allow_autoexit, elapsed_ms, read_sysutil_signal]() CallFromMainThread([this, allow_autoexit, elapsed_ms, read_sysutil_signal]()
{ {