daemon: Initialize dbus to use thread-safe mode by default
authorDavid Henningsson <david.henningsson@canonical.com>
Mon, 12 Mar 2012 23:06:22 +0000 (00:06 +0100)
committerTanu Kaskinen <tanuk@iki.fi>
Tue, 13 Mar 2012 14:16:32 +0000 (16:16 +0200)
In most cases, we use dbus from more than one thread, as we
e.g. enable real-time scheduling from the ALSA threads.
Therefore set dbus to thread-safe mode by default, as recommended
in https://bugs.freedesktop.org/show_bug.cgi?id=47060#c5

This fixes a bug where PulseAudio could crash in two parallel
calls to pa_make_realtime.

BugLink: https://bugs.launchpad.net/bugs/937933
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
src/daemon/main.c

index 19933e3..da1e0cf 100644 (file)
@@ -1066,6 +1066,8 @@ int main(int argc, char *argv[]) {
     buf = pa_strbuf_new();
 
 #ifdef HAVE_DBUS
+    pa_assert_se(dbus_threads_init_default());
+
     if (start_server) {
 #endif
         if (conf->load_default_script_file) {