Attachment 48338 Details for Bug 38005 – [PATCH 4/8] DBusConnection: use atomic accesses to refcount, even for assertions

[patch] [PATCH 4/8] DBusConnection: use atomic accesses to refcount, even for assertions

0004-DBusConnection-use-atomic-accesses-to-refcount-even-.patch (text/plain), 1.49 KB, created by Simon McVittie on 2011-06-23 06:47:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-23 06:47:11 UTC

Size: 1.49 KB

patch

obsolete

>From 80d76bb3d4ebf1101a8fe895459cce0a8369cd9f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 23 Jun 2011 13:36:25 +0100
>Subject: [PATCH 4/8] DBusConnection: use atomic accesses to refcount, even
> for assertions
>
>---
> dbus/dbus-connection.c |   16 +++++++++++-----
> 1 files changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 8849b1c..d80604a 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -1318,8 +1318,9 @@ _dbus_connection_new_for_transport (DBusTransport *transport)
>   
>   if (_dbus_modify_sigpipe)
>     _dbus_disable_sigpipe ();
>-  
>-  connection->refcount.value = 1;
>+
>+  /* initialized to 0: use atomic op to avoid mixing atomic and non-atomic */
>+  _dbus_atomic_inc (&connection->refcount);
>   connection->transport = transport;
>   connection->watches = watch_list;
>   connection->timeouts = timeout_list;
>@@ -2661,11 +2662,16 @@ static void
> _dbus_connection_last_unref (DBusConnection *connection)
> {
>   DBusList *link;
>+  dbus_int32_t old_refcount;
> 
>   _dbus_verbose ("Finalizing connection %p\n", connection);
>-  
>-  _dbus_assert (connection->refcount.value == 0);
>-  
>+
>+#ifndef DBUS_DISABLE_ASSERT
>+  old_refcount = _dbus_atomic_inc (&connection->refcount);
>+  _dbus_atomic_dec (&connection->refcount);
>+  _dbus_assert (old_refcount == 0);
>+#endif
>+
>   /* You have to disconnect the connection before unref:ing it. Otherwise
>    * you won't get the disconnected message.
>    */
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 38005: 47660 | 48335 | 48336 | 48337 | 48338 | 48339 | 48340 | 48341 | 48342 | 49096 | 49097 | 49098 | 49100 | 49102 | 49103 | 49349 | 49675

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.