From fe4018941190f8bf020e4a8ed2999c212e0e113d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Sat, 15 Feb 2003 16:25:08 +0000 Subject: 2003-02-15 Alexander Larsson * dbus/dbus-threads.c: * dbus/dbus-threads.h: Add condvars. Remove static mutext from API. Implement static mutexes by initializing them from threads_init. * glib/dbus-gthread.c: * qt/dbus-qthread.cpp: Update with the thread api changes. * dbus/dbus-list.c: * dbus/dbus-list.h: Turn StaticMutex into normal mutex + init function. Export new functions _dbus_list_alloc_link, _dbus_list_free_link, _dbus_list_append_link, _dbus_list_prepend_link * dbus/dbus-sysdeps.c: * dbus/dbus-sysdeps.h: New type dbus_atomic_t, and new functions _dbus_atomic_inc, _dbus_atomic_dec. Only slow fallback implementation at the moment. * dbus/dbus-protocol.h: Add DBUS_MESSAGE_LOCAL_DISCONNECT define * dbus/dbus-message.c: Make ref/unref atomic. Fix some docs. * dbus/dbus-connection-internal.h: * dbus/dbus-connection.c: * dbus/dbus-connection.h: Make threadsafe. Change _peek to _borrow,_return & _steal_borrowed. Change disconnect callback to event. Make dbus_connection_dispatch_messages reentrant. * dbus/dbus-transport.c: Don't ref the connection on calls to the transport implementation. * dbus/dbus-message-handler.c: Make threadsafe. * glib/dbus-gmain.c: Don't use peek_message anymore * test/Makefile.am: * test/debug-thread.c: * test/debug-thread.h: Simple thread implementation that asserts() on deadlocks in single-threaded code. * test/bus-test.c: (main) Call debug_threads_init. * test/watch.c: Use disconnect message instead of disconnect callback. * bus/connection.c: * bus/connection.h: Don't call dbus_connection_set_disconnect_function. Instead export bus_connection_disconnect. * bus/dispatch.c: Call bus_connection_disconnect when we get a disconnected message. --- dbus/dbus-sysdeps.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'dbus/dbus-sysdeps.c') diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 38efb0cd..53eebf77 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -23,6 +23,7 @@ #include "dbus-internals.h" #include "dbus-sysdeps.h" +#include "dbus-threads.h" #include #include #include @@ -941,6 +942,55 @@ _dbus_string_append_our_uid (DBusString *str) } +static DBusMutex *atomic_lock = NULL; +DBusMutex *_dbus_atomic_init_lock (void); +DBusMutex * +_dbus_atomic_init_lock (void) +{ + atomic_lock = dbus_mutex_new (); + return atomic_lock; +} + +/** + * Atomically increments an integer + * + * @param atomic pointer to the integer to increment + * @returns the value after incrementing + * + * @todo implement arch-specific faster atomic ops + */ +dbus_atomic_t +_dbus_atomic_inc (dbus_atomic_t *atomic) +{ + dbus_atomic_t res; + + dbus_mutex_lock (atomic_lock); + *atomic += 1; + res = *atomic; + dbus_mutex_unlock (atomic_lock); + return res; +} + +/** + * Atomically decrement an integer + * + * @param atomic pointer to the integer to decrement + * @returns the value after decrementing + * + * @todo implement arch-specific faster atomic ops + */ +dbus_atomic_t +_dbus_atomic_dec (dbus_atomic_t *atomic) +{ + dbus_atomic_t res; + + dbus_mutex_lock (atomic_lock); + *atomic -= 1; + res = *atomic; + dbus_mutex_unlock (atomic_lock); + return res; +} + /** * Wrapper for poll(). * -- cgit