Commit c9723c407ff0792b5bb5708754fa760ae9144da6
2020-12-07T09:38:21
Fixed potential hang in joystick close if the rumble thread is blocked for some reason It's still possible to hang when shutting down, if the rumble thread is still hung, but it won't block indefinitely at runtime.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/src/joystick/hidapi/SDL_hidapi_rumble.c b/src/joystick/hidapi/SDL_hidapi_rumble.c
index 9aae15e..a9477d9 100644
--- a/src/joystick/hidapi/SDL_hidapi_rumble.c
+++ b/src/joystick/hidapi/SDL_hidapi_rumble.c
@@ -90,6 +90,8 @@ static int SDL_HIDAPI_RumbleThread(void *data)
static void
SDL_HIDAPI_StopRumbleThread(SDL_HIDAPI_RumbleContext *ctx)
{
+ SDL_HIDAPI_RumbleRequest *request;
+
SDL_AtomicSet(&ctx->running, SDL_FALSE);
if (ctx->thread) {
@@ -100,9 +102,18 @@ SDL_HIDAPI_StopRumbleThread(SDL_HIDAPI_RumbleContext *ctx)
ctx->thread = NULL;
}
- /* This should always be called with an empty queue */
- SDL_assert(!ctx->requests_head);
- SDL_assert(!ctx->requests_tail);
+ SDL_LockMutex(ctx->lock);
+ while (ctx->requests_tail) {
+ request = ctx->requests_tail;
+ if (request == ctx->requests_head) {
+ ctx->requests_head = NULL;
+ }
+ ctx->requests_tail = request->prev;
+
+ (void)SDL_AtomicDecRef(&request->device->rumble_pending);
+ SDL_free(request);
+ }
+ SDL_UnlockMutex(ctx->lock);
if (ctx->request_sem) {
SDL_DestroySemaphore(ctx->request_sem);
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 5684e55..3dc942f 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -833,6 +833,11 @@ HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
HIDAPI_CleanupDeviceDriver(device);
+ /* Make sure the rumble thread is done with this device */
+ while (SDL_AtomicGet(&device->rumble_pending) > 0) {
+ SDL_Delay(10);
+ }
+
SDL_DestroyMutex(device->dev_lock);
SDL_free(device->serial);
SDL_free(device->name);
@@ -1193,10 +1198,13 @@ HIDAPI_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->hwdata) {
SDL_HIDAPI_Device *device = joystick->hwdata->device;
+ int i;
- /* Wait for pending rumble to complete */
- while (SDL_AtomicGet(&device->rumble_pending) > 0) {
- SDL_Delay(10);
+ /* Wait up to 30 ms for pending rumble to complete */
+ for (i = 0; i < 3; ++i) {
+ while (SDL_AtomicGet(&device->rumble_pending) > 0) {
+ SDL_Delay(10);
+ }
}
device->driver->CloseJoystick(device, joystick);
@@ -1215,11 +1223,14 @@ HIDAPI_JoystickQuit(void)
HIDAPI_ShutdownDiscovery();
+ SDL_HIDAPI_QuitRumble();
+
while (SDL_HIDAPI_devices) {
HIDAPI_DelDevice(SDL_HIDAPI_devices);
}
- SDL_HIDAPI_QuitRumble();
+ /* Make sure the drivers cleaned up properly */
+ SDL_assert(SDL_HIDAPI_numjoysticks == 0);
for (i = 0; i < SDL_arraysize(SDL_HIDAPI_drivers); ++i) {
SDL_HIDAPI_DeviceDriver *driver = SDL_HIDAPI_drivers[i];
@@ -1230,9 +1241,6 @@ HIDAPI_JoystickQuit(void)
hid_exit();
- /* Make sure the drivers cleaned up properly */
- SDL_assert(SDL_HIDAPI_numjoysticks == 0);
-
shutting_down = SDL_FALSE;
initialized = SDL_FALSE;
}