Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-04-16 21:46:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

dbus: Wrap init in a spinlock.

Browse Source 
This prevents a race if two threads that need d-bus try to init it at the
same time. Note that SDL_Init will likely handle this from a single thread
at startup, but there are places outside of init where one might trigger
D-Bus init, like setting thread priority (a common first thing for a new
thread to do) resulting in SDL trying to use RTKit.

Fixes #4587.
This commit is contained in:
Ryan C. Gordon 2021-08-04 13:30:12 -04:00
parent b08b1bde66
commit d483970262
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/linux/SDL_dbus.c
View File

@ -20,6 +20,7 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#include "SDL_dbus.h" #include "SDL_dbus.h"
#include "SDL_atomic.h"
#if SDL_USE_LIBDBUS #if SDL_USE_LIBDBUS
/* we never link directly to libdbus. */ /* we never link directly to libdbus. */
@ -113,8 +114,12 @@ LoadDBUSLibrary(void)
return retval; return retval;
} }
void
SDL_DBus_Init(void) static SDL_SpinLock spinlock_dbus_init = 0;
/* you must hold spinlock_dbus_init before calling this! */
static void
SDL_DBus_Init_Spinlocked(void)
{ {
static SDL_bool is_dbus_available = SDL_TRUE; static SDL_bool is_dbus_available = SDL_TRUE;
if (!is_dbus_available) { if (!is_dbus_available) {
@ -156,6 +161,14 @@ SDL_DBus_Init(void)
} }
} }
void
SDL_DBus_Init(void)
{
SDL_AtomicLock(&spinlock_dbus_init); /* make sure two threads can't init at same time, since this can happen before SDL_Init. */
SDL_DBus_Init_Spinlocked();
SDL_AtomicUnlock(&spinlock_dbus_init);
}
void void
SDL_DBus_Quit(void) SDL_DBus_Quit(void)
{ {