zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-01-19 07:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix race condition when trying to make several threads real-time simultaneously

Browse source
This commit is contained in:
David Henningsson 2010-07-03 12:26:03 +00:00
parent 668901c737
commit b4ee43c81b
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fluidsynth/src/bindings/fluid_rtkit.c
View file

@ -320,6 +320,14 @@ long long rtkit_get_rttime_nsec_max(DBusConnection *connection) {
# define RLIMIT_RTTIME 15 # define RLIMIT_RTTIME 15
#endif #endif
#define MAKE_REALTIME_RETURN(_value) \
do { \
dbus_connection_close(conn); \
dbus_connection_unref(conn); \
return _value; \
} while (0)
int fluid_rtkit_make_realtime(pid_t thread, int priority) { int fluid_rtkit_make_realtime(pid_t thread, int priority) {
DBusConnection *conn = NULL; DBusConnection *conn = NULL;
DBusError error; DBusError error;
@ -329,7 +337,7 @@ int fluid_rtkit_make_realtime(pid_t thread, int priority) {
/* Initialize system bus connection */ /* Initialize system bus connection */
dbus_error_init(&error); dbus_error_init(&error);
conn = dbus_bus_get(DBUS_BUS_SYSTEM, &error); conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
if (conn == NULL) { if (conn == NULL) {
res = translate_error(error.name); res = translate_error(error.name);
dbus_error_free(&error); dbus_error_free(&error);
@ -340,26 +348,27 @@ int fluid_rtkit_make_realtime(pid_t thread, int priority) {
/* Make sure we don't fail by wanting too much */ /* Make sure we don't fail by wanting too much */
max_prio = rtkit_get_max_realtime_priority(conn); max_prio = rtkit_get_max_realtime_priority(conn);
if (max_prio < 0) if (max_prio < 0)
return max_prio; MAKE_REALTIME_RETURN(max_prio);
if (priority >= max_prio) if (priority >= max_prio)
priority = max_prio; priority = max_prio;
/* Enforce RLIMIT_RTTIME, also a must for obtaining rt prio through rtkit */ /* Enforce RLIMIT_RTTIME, also a must for obtaining rt prio through rtkit */
max_rttime = rtkit_get_rttime_nsec_max(conn); max_rttime = rtkit_get_rttime_nsec_max(conn);
if (max_rttime < 0) if (max_rttime < 0)
return max_rttime; MAKE_REALTIME_RETURN(max_rttime);
new_limit.rlim_cur = new_limit.rlim_max = max_rttime; new_limit.rlim_cur = new_limit.rlim_max = max_rttime;
if (getrlimit(RLIMIT_RTTIME, &old_limit) < 0) if (getrlimit(RLIMIT_RTTIME, &old_limit) < 0)
return -1; MAKE_REALTIME_RETURN(-1);
if (setrlimit(RLIMIT_RTTIME, &new_limit) < 0) if (setrlimit(RLIMIT_RTTIME, &new_limit) < 0)
return -1; MAKE_REALTIME_RETURN(-1);
/* Finally, let's try */ /* Finally, let's try */
res = rtkit_make_realtime(conn, thread, priority); res = rtkit_make_realtime(conn, thread, priority);
if (res != 0) { if (res != 0) {
setrlimit(RLIMIT_RTTIME, &old_limit); setrlimit(RLIMIT_RTTIME, &old_limit);
} }
return res; MAKE_REALTIME_RETURN(res);
} }