mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-19 04:19:57 -04:00
Run every orderly exit through one sequence that puts RivaTuner's profile back before the slow pipeline save.
The window's close, the guest's ExitProcess and the end of a --seconds run each ran their own list. All three waited for the pipeline save (up to 5 s for running builds, then the write) before they put RivaTuner Statistics Server's profile back, stopped HD rumble, wrote the frame-time summary and flushed the save, so a console close, a session end or an "End task" that killed the process in that wait left the game's limit in RTSS's profile (the next run takes it for the player's own), a buzzing controller and no exit summary. ExitProcess also lacked cfg_save and the rumble stop, and it and the window's close had no shared guard, so both could run at once and write the summary twice while the present thread still added to it. gfx_present.c rt_exit_begin is the one guard (the first caller runs; another thread waits for good; the same thread again returns, and svc.c ends the process then rather than resume guest code). rt_exit_steps runs, in order: fs_save_wait (a Commit under way finishes, none is refused), rtss_limit_restore, input_rumble_hd_stop, cfg_save (not for --seconds), the prewarm marker clear, prof_write, vk_mem_exit_log, a non-final log flush (the new logq.c logq_flush, bounded trylocks, queue left on), vk_pipeline_save_exit, and fs_save_flush last. perf.c ft_stop keeps the present thread's frame-time updates out of the exit's summary and waits at most 50 ms, on the exiting thread, for one under way. The restore relies on rtss_limit.c's closed flag to stay restored while frames go on during the pipeline save. The log order changes: "frametime: exit" and the stutter-map exit lines now come before the pipeline save's lines. Not reproduced before the change. tests/exit_order_check.py (new: the step order, the once-guard with a second thread, ft_stop's wait and bound, and statically that the three exits use the helper with the RTSS restore before the pipeline save), tests/logq_check.py (with a logq_flush case), tests/save_share_check.py and the compile checks pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -152,6 +152,28 @@ int logq_async(void) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// What is queued, written now on the calling thread, with the queue left on: a point the log is to have reached on the
|
||||
// disk before something slow comes (the orderly end before its pipeline save, gfx_present.c rt_exit_steps). Each lock
|
||||
// is tried for at most 100 ms: the log thread may be stuck in a write and hold io. Without both locks nothing is
|
||||
// written here, since other threads still queue and write, and the log thread writes the lines when it can.
|
||||
void logq_flush(void) {
|
||||
if (!__atomic_load_n(&Q.on, __ATOMIC_ACQUIRE)) return;
|
||||
int io = 0, q = 0;
|
||||
for (int i = 0; i < 100 && !(io = plat_mutex_trylock(&Q.io)); i++) plat_sleep_ms(1);
|
||||
if (!io) return;
|
||||
for (int i = 0; i < 100 && !(q = plat_mutex_trylock(&Q.q)); i++) plat_sleep_ms(1);
|
||||
if (!q) {
|
||||
plat_mutex_unlock(&Q.io);
|
||||
return;
|
||||
}
|
||||
char *b = Q.buf;
|
||||
size_t n = Q.n;
|
||||
Q.buf = Q.out, Q.out = b, Q.n = 0;
|
||||
plat_mutex_unlock(&Q.q);
|
||||
if (n) put_out(b, n);
|
||||
plat_mutex_unlock(&Q.io);
|
||||
}
|
||||
|
||||
void logq_sync(void) {
|
||||
if (!plat_xchg32(&Q.on, 0)) return;
|
||||
// Each lock is tried for half a second: the thread that holds it may be the one that crashed, or be stuck in the
|
||||
|
||||
Reference in New Issue
Block a user