summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-threads.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2006-10-28 01:41:37 +0000
committerHavoc Pennington <hp@redhat.com>2006-10-28 01:41:37 +0000
commiteaefe03a8891b84e3f9e1f99f9098d65567e3092 (patch)
tree4704a6dac805f85df83593a435fb90c28e3163b9 /dbus/dbus-threads.c
parentfeb7d3a0f0e2404e81fbe6252864ab599e1fa38d (diff)
2006-10-27 Havoc Pennington <hp@redhat.com>
* dbus/dbus-test.c: enclose more of the file in the DBUS_BUILD_TESTS check. * dbus/dbus-sysdeps-pthread.c (PTHREAD_CHECK): fix for DBUS_DISABLE_ASSERT case. * dbus/dbus-connection.c (dbus_connection_get_unix_user): document that it only works on the server side * dbus/dbus-bus.c: add a global lock covering the BusData we attach to each connection (internal_bus_get): lock our access to the BusData (dbus_bus_register): lock the entire registration process with _DBUS_LOCK(bus_datas). If we get the lock and registration is already complete, silently return (vs. previous behavior of aborting). (dbus_bus_set_unique_name): lock the BusData (dbus_bus_get_unique_name): lock the BusData
Diffstat (limited to 'dbus/dbus-threads.c')
-rw-r--r--dbus/dbus-threads.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index f962316b..a8712ff6 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -426,6 +426,7 @@ init_locks (void)
LOCK_ADDR (message_slots),
LOCK_ADDR (atomic),
LOCK_ADDR (bus),
+ LOCK_ADDR (bus_datas),
LOCK_ADDR (shutdown_funcs),
LOCK_ADDR (system_users),
LOCK_ADDR (message_cache),