geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed deadlock when shutting down the Windows joystick system

main
Sam Lantinga 2022-08-30 12:58:38 -07:00
parent 371735e95b
commit 92d3fc4883
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/joystick/SDL_joystick.c
View File

@ -130,6 +130,12 @@ SDL_JoysticksInitialized(void)
return SDL_joysticks_initialized; return SDL_joysticks_initialized;
} }
SDL_bool
SDL_JoysticksQuitting(void)
{
return SDL_joysticks_quitting;
}
void void
SDL_LockJoysticks(void) SDL_LockJoysticks(void)
{ {
@ -159,18 +165,12 @@ SDL_UnlockJoysticks(void)
} }
} }
static void void
SDL_AssertJoysticksLocked(void) SDL_AssertJoysticksLocked(void)
{ {
SDL_assert(SDL_joysticks_locked > 0); SDL_assert(SDL_joysticks_locked > 0);
} }
SDL_bool
SDL_JoysticksQuitting(void)
{
return SDL_joysticks_quitting;
}
/* /*
* Get the driver and device index for an API device index * Get the driver and device index for an API device index
* This should be called while the joystick lock is held, to prevent another thread from updating the list * This should be called while the joystick lock is held, to prevent another thread from updating the list

3
src/joystick/SDL_joystick_c.h
View File

@ -45,6 +45,9 @@ extern SDL_bool SDL_JoysticksInitialized(void);
/* Return whether the joystick system is shutting down */ /* Return whether the joystick system is shutting down */
extern SDL_bool SDL_JoysticksQuitting(void); extern SDL_bool SDL_JoysticksQuitting(void);
/* Make sure we currently have the joysticks locked */
extern void SDL_AssertJoysticksLocked(void);
/* Function to get the next available joystick instance ID */ /* Function to get the next available joystick instance ID */
extern SDL_JoystickID SDL_GetNextJoystickInstanceID(void); extern SDL_JoystickID SDL_GetNextJoystickInstanceID(void);

5
src/joystick/windows/SDL_windowsjoystick.c
View File

@ -429,7 +429,12 @@ SDL_StopJoystickThread(void)
SDL_CondBroadcast(s_condJoystickThread); /* signal the joystick thread to quit */ SDL_CondBroadcast(s_condJoystickThread); /* signal the joystick thread to quit */
SDL_UnlockMutex(s_mutexJoyStickEnum); SDL_UnlockMutex(s_mutexJoyStickEnum);
PostThreadMessage(SDL_GetThreadID(s_joystickThread), WM_QUIT, 0, 0); PostThreadMessage(SDL_GetThreadID(s_joystickThread), WM_QUIT, 0, 0);
/* Unlock joysticks while the joystick thread finishes processing messages */
SDL_AssertJoysticksLocked();
SDL_UnlockJoysticks();
SDL_WaitThread(s_joystickThread, NULL); /* wait for it to bugger off */ SDL_WaitThread(s_joystickThread, NULL); /* wait for it to bugger off */
SDL_LockJoysticks();
SDL_DestroyCond(s_condJoystickThread); SDL_DestroyCond(s_condJoystickThread);
s_condJoystickThread = NULL; s_condJoystickThread = NULL;