diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-16 15:39:54 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-17 16:53:51 +0100 |
| commit | c80c20af46c5f43dcbe672f2c6d8aec0e7f2bbd6 (patch) | |
| tree | b88990c3946b35408a7463a3e51296800bd8f389 /cmake | |
| parent | 7e9ee6c82e42ffa3f6e4e69e077f72df6f4107db (diff) | |
| download | dbus-c80c20af46c5f43dcbe672f2c6d8aec0e7f2bbd6.tar.gz | |
Replace individual global-lock variables with an array of DBusRMutex *
This means we can use a much simpler code structure in data-slot
allocators: instead of giving them a DBusRMutex ** at first-allocation,
we can just give them an index into the array, which can be done
statically.
It doesn't make us any more thread-safe-by-default - the mutexes will
only actually be used if threads were already initialized - but it's
substantially better than nothing.
These locks really do have to be recursive: for instance,
internal_bus_get() calls dbus_bus_register() under the bus lock,
and dbus_bus_register() can call _dbus_connection_close_possibly_shared(),
which takes the bus lock.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54972
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Anas Nashif <anas.nashif@intel.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Doxyfile.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/Doxyfile.cmake b/cmake/Doxyfile.cmake index e00984e7..3c63d95a 100644 --- a/cmake/Doxyfile.cmake +++ b/cmake/Doxyfile.cmake @@ -147,7 +147,6 @@ PREDEFINED = "DBUS_BEGIN_DECLS=" \ "DBUS_END_DECLS=" \ "DOXYGEN_SHOULD_SKIP_THIS" \ "DBUS_GNUC_DEPRECATED=" \ - "_DBUS_DEFINE_GLOBAL_LOCK(name)=" \ "_DBUS_GNUC_PRINTF(from,to)=" \ "DBUS_EXPORT=" SKIP_FUNCTION_MACROS = YES |