mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-17 07:09:57 -04:00
Stop HD rumble at a fatal error and a crash too, on a thread of its own the end waits for 300 ms at most.
input_rumble_hd_stop ran only in the orderly ends, so a FATAL or a crash while a controller vibrated on HD rumble left it buzzing: nothing renews or stops the value after the process is gone (input.c says so). It also took hd_lock with a blocking lock while it only tried the other two. dispatch.c rt_rumble_stop_bounded runs input_rumble_hd_stop (weak in dispatch.c, as fs_save_crash_wait is, for builds without input.c) on a new "rumble stop" thread and waits at most 300 ms for it, never joining it: the stop goes through SDL, which takes its own joystick lock, and a crash on SDL's thread while it held that lock would otherwise keep the ending thread there and the process would never end. fatal_end and main.c crash_handler call it right after rtss_limit_restore. input.c tries hd_lock 50 times 1 ms apart, as it does `lock` and sdl_lock, and skips the stop when it is not taken. Not reproduced before the change. tests/fatal_exit_check.py (now linking dispatch.c as its own unit: the stop runs at a fatal error; a stop that hangs leaves the end at code 70 after 0.3 s; statically both failed ends call the bounded stop after the RTSS restore), tests/rumble_hd_check.py and the compile checks pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -717,7 +717,12 @@ void input_rumble_hd_stop(void) {
|
||||
// The locks are tried for a while and not waited for: a thread of the game may hold one for good by now.
|
||||
for (int i = 0; i < 50 && !(got = plat_mutex_trylock(&lock)); i++) plat_wait_ns(1000000);
|
||||
if (!got) return;
|
||||
plat_mutex_lock(&hd_lock);
|
||||
got = 0;
|
||||
for (int i = 0; i < 50 && !(got = plat_mutex_trylock(&hd_lock)); i++) plat_wait_ns(1000000);
|
||||
if (!got) { // a fatal error or a crash on the thread that writes the reports (dispatch.c rt_rumble_stop_bounded)
|
||||
plat_mutex_unlock(&lock);
|
||||
return;
|
||||
}
|
||||
hd_ended = 1;
|
||||
int buzzing = rumble_hd_buzzing(&hd);
|
||||
rumble_hd_forget(&hd);
|
||||
|
||||
Reference in New Issue
Block a user