Attachment 49100 Details for Bug 38005 – [PATCH 7/9] DBusConnection: use atomic accesses to refcount in assertions/initial ref

[patch] [PATCH 7/9] DBusConnection: use atomic accesses to refcount in assertions/initial ref

0007-DBusConnection-use-atomic-accesses-to-refcount-in-as.patch (text/plain), 1.33 KB, created by Simon McVittie on 2011-07-14 10:53:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-07-14 10:53:06 UTC

Size: 1.33 KB

patch

obsolete

>From 0110bf231f328be733e0fddf78de1171b86c9725 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 14 Jul 2011 17:23:21 +0100
>Subject: [PATCH 7/9] DBusConnection: use atomic accesses to refcount in
> assertions/initial ref
>
>---
> dbus/dbus-connection.c |   11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 4b74341..8b8310d 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;
>@@ -2655,9 +2656,9 @@ _dbus_connection_last_unref (DBusConnection *connection)
>   DBusList *link;
> 
>   _dbus_verbose ("Finalizing connection %p\n", connection);
>-  
>-  _dbus_assert (connection->refcount.value == 0);
>-  
>+
>+  _dbus_assert (_dbus_atomic_get (&connection->refcount) == 0);
>+
>   /* 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.