diff options
author | Alexander Larsson <alexl@redhat.com> | 2003-02-15 16:25:08 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2003-02-15 16:25:08 +0000 |
commit | fe4018941190f8bf020e4a8ed2999c212e0e113d (patch) | |
tree | 37f34a8405a5d1bc765a72b4457e47c212c0ca5f /dbus/dbus-message.c | |
parent | ece62d7c14aab02ee0b3d3d6e15a22b663ef8da2 (diff) |
2003-02-15 Alexander Larsson <alexl@redhat.com>
* 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.
Diffstat (limited to 'dbus/dbus-message.c')
-rw-r--r-- | dbus/dbus-message.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 91ff29da..aca8c2cb 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -81,7 +81,7 @@ typedef struct */ struct DBusMessage { - int refcount; /**< Reference count */ + dbus_atomic_t refcount; /**< Reference count */ DBusString header; /**< Header network data, stored * separately from body so we can @@ -887,9 +887,10 @@ dbus_message_new_from_message (const DBusMessage *message) void dbus_message_ref (DBusMessage *message) { - _dbus_assert (message->refcount > 0); - - message->refcount += 1; + dbus_atomic_t refcount; + + refcount = _dbus_atomic_inc (&message->refcount); + _dbus_assert (refcount > 1); } /** @@ -901,10 +902,13 @@ dbus_message_ref (DBusMessage *message) void dbus_message_unref (DBusMessage *message) { - _dbus_assert (message->refcount > 0); + dbus_atomic_t refcount; - message->refcount -= 1; - if (message->refcount == 0) + refcount = _dbus_atomic_dec (&message->refcount); + + _dbus_assert (refcount >= 0); + + if (refcount == 0) { if (message->size_counter != NULL) { @@ -1519,7 +1523,7 @@ dbus_message_iter_get_string (DBusMessageIter *iter) /** * Returns the 32 bit signed integer value that an iterator may point to. * Note that you need to check that the iterator points to - * a string value before using this function. + * an integer value before using this function. * * @see dbus_message_iter_get_field_type * @param iter the message iter @@ -1535,7 +1539,7 @@ dbus_message_iter_get_int32 (DBusMessageIter *iter) /** * Returns the 32 bit unsigned integer value that an iterator may point to. * Note that you need to check that the iterator points to - * a string value before using this function. + * an unsigned integer value before using this function. * * @see dbus_message_iter_get_field_type * @param iter the message iter |