mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 11:09:56 -04:00
Keep RivaTuner Statistics Server's profile as it was in rtss-profile.txt, so a start after a kill or crash puts it back, and leave it to that start at a crash.
An exit that skipped rtss_limit_restore (Task Manager, a hang, lost_wait_exit, a kill during the pipeline save) left the game's limit in Profiles\<exe>.cfg, and the next run's first apply took it for the player's own: that run then put the stale limit back at its close, and a profile the game had made stayed for good (lane A's probe: kill1, then kill2 'held a limit of 60/1'). The crash handler and the fatal error's end also called into RTSSHooks64.dll from a process that had failed (P-13). rtss_limit.c now keeps one line per profile in rtss-profile.txt next to the executable (rtss_decide.h RtssSaved: whether the profile existed, its old limit and denominator, the value the run wrote), written atomically before the run's first change of the profile, updated with each value written, and removed once the profile is back (put_back; also when the first write did not stick). On the first poll with the hooks library a start that finds a line of its profile puts the profile back first (restore_left, rtss_restore_plan): the old limit, or no profile, unless the player changed or removed it since, which the written value tells. main.c crash_handler and dispatch.c fatal_end call the new rtss_limit_crash, which closes the run and leaves the profile to that start with no call into RTSS's library; only when the file could not be written does it put the profile back as before, and never from the worker's own thread. A file that cannot be written leaves the run as it was, with one line in the log. Profiles frozen by earlier versions cannot be told from the player's own. Not reproduced before the change. rtss_limit_check (T12: the line's format and parse, the file's rewrite, each plan; the static check that both crash paths go through rtss_limit_crash), rtss_worker_check (state_record, state_player, state_unwritable, crash_recorded, and kill_restart with its player and edited variants, each a killed run and the next start in processes of their own), fatal_exit_check and exit_order_check pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -5,8 +5,9 @@ checks statically that no runtime file outside the platform layer ends the proce
|
||||
error's end and the lost device's (runtime/vk_device.c lost_wait_exit) end with plat_terminate. No game files, no GPU.
|
||||
|
||||
A fatal error stops HD rumble on a thread of its own and waits for it 300 ms at most (runtime/dispatch.c
|
||||
rt_rumble_stop_bounded), so a stop that hangs on SDL's lock does not hold the end. A fatal error on RTSS's own thread
|
||||
("rtss") skips RivaTuner's restore, whose lock that thread may hold.
|
||||
rt_rumble_stop_bounded), so a stop that hangs on SDL's lock does not hold the end. RivaTuner's profile is left to the
|
||||
next start (runtime/rtss_limit.c rtss_limit_crash), which on RTSS's own thread ("rtss"), whose lock that thread may
|
||||
hold, makes no call into RTSS's library and takes no lock.
|
||||
|
||||
Two failures at once end once: two threads that fault, a fault while a fatal error is reported and a fatal error
|
||||
while a crash is: the first report is written whole, the process ends with its code, and the second adds no line
|
||||
@@ -86,13 +87,13 @@ def static_checks():
|
||||
print(f'static: perf.c perf_summary_flush_try tries the stutter map\'s lock and leaves the back end out: '
|
||||
f'{"ok" if ok else "FAIL"}', flush=True)
|
||||
bad += not ok
|
||||
# both failed ends stop HD rumble through the bounded stop, after RivaTuner's restore
|
||||
# both failed ends stop HD rumble through the bounded stop, after RivaTuner's profile is left to the next start
|
||||
fatal = re.sub(r'//[^\n]*', '', function((RT / 'dispatch.c').read_text(encoding='utf-8'),
|
||||
'static void fatal_end(int code, const char *fmt, va_list ap) {'))
|
||||
for name, code in (('dispatch.c fatal_end', fatal), ('main.c crash_handler', body)):
|
||||
r, s = code.find('rtss_limit_restore('), code.find('rt_rumble_stop_bounded(')
|
||||
r, s = code.find('rtss_limit_crash('), code.find('rt_rumble_stop_bounded(')
|
||||
ok = 0 <= r < s and 'input_rumble_hd_stop(' not in code
|
||||
print(f'static: {name} stops HD rumble through rt_rumble_stop_bounded after the RTSS restore: '
|
||||
print(f'static: {name} stops HD rumble through rt_rumble_stop_bounded after rtss_limit_crash: '
|
||||
f'{"ok" if ok else "FAIL"}', flush=True)
|
||||
bad += not ok
|
||||
# a first report that hangs: the thread that waits for it ends the process after 30 s with that report's code, and
|
||||
@@ -104,10 +105,10 @@ def static_checks():
|
||||
print(f'static: dispatch.c rt_ending_enter ends a hung first report with that report\'s code: '
|
||||
f'{"ok" if ok else "FAIL"}', flush=True)
|
||||
bad += not ok
|
||||
# the fatal error's frame-time summary comes after the RTSS restore and the rumble stop, as in the orderly end
|
||||
# the fatal error's frame-time summary comes after RTSS's end and the rumble stop, as in the orderly end
|
||||
s, p = fatal.find('rt_rumble_stop_bounded('), fatal.find('perf_summary_flush_try(')
|
||||
ok = 0 <= s < p
|
||||
print(f'static: dispatch.c fatal_end writes the frame-time summary after the RTSS restore and the rumble stop: '
|
||||
print(f'static: dispatch.c fatal_end writes the frame-time summary after RTSS\'s end and the rumble stop: '
|
||||
f'{"ok" if ok else "FAIL"}', flush=True)
|
||||
bad += not ok
|
||||
return bad
|
||||
@@ -115,10 +116,11 @@ def static_checks():
|
||||
|
||||
CASES = [
|
||||
# mode, exit code, lines that must be there, lines that must not
|
||||
('fatal', 70, ['FATAL: the test\'s fatal error 1', 'frametime: at a fatal error', 'rumble: stopped', 'rtss: restored'],
|
||||
('fatal', 70, ['FATAL: the test\'s fatal error 1', 'frametime: at a fatal error', 'rumble: stopped',
|
||||
'rtss: left to the next start'], ['detach:']),
|
||||
# rt_fatal on RTSS's own thread: rtss_limit_crash runs from there too, and takes no lock there
|
||||
('fatal_rtss', 70, ['FATAL: the test\'s fatal error 3', 'rumble: stopped', 'rtss: left to the next start'],
|
||||
['detach:']),
|
||||
# rt_fatal on RTSS's own thread, which may hold the lock the restore tries: no restore from there
|
||||
('fatal_rtss', 70, ['FATAL: the test\'s fatal error 3', 'rumble: stopped'], ['rtss: restored', 'detach:']),
|
||||
# the rumble stop hangs (SDL's lock held by a thread that crashed): the end goes on after 300 ms
|
||||
('fatal_rumble', 70, ['FATAL: the test\'s fatal error 1'], ['rumble: stopped', 'detach:']),
|
||||
# two faults at once: the first report whole, the second thread waits (dispatch.c rt_ending_enter)
|
||||
|
||||
Reference in New Issue
Block a user