Attachment 49097 Details for Bug 38005 – [PATCH 5/9] _dbus_connection_close_if_only_one_ref: use _dbus_atomic_get

[patch] [PATCH 5/9] _dbus_connection_close_if_only_one_ref: use _dbus_atomic_get

0005-_dbus_connection_close_if_only_one_ref-use-_dbus_ato.patch (text/plain), 1.58 KB, created by Simon McVittie on 2011-07-14 10:51:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-07-14 10:51:57 UTC

Size: 1.58 KB

patch

obsolete

>From 63b77dd60701ce6b02ce3e121f34815531ebe328 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 14 Jul 2011 17:14:06 +0100
>Subject: [PATCH 5/9] _dbus_connection_close_if_only_one_ref: use
> _dbus_atomic_get
>
>---
> dbus/dbus-connection.c |   18 +++++-------------
> 1 files changed, 5 insertions(+), 13 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index a1f3320..4b74341 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -2116,23 +2116,15 @@ _dbus_connection_send_and_unlock (DBusConnection *connection,
> void
> _dbus_connection_close_if_only_one_ref (DBusConnection *connection)
> {
>-  dbus_int32_t tmp_refcount;
>+  dbus_int32_t refcount;
> 
>   CONNECTION_LOCK (connection);
> 
>-  /* We increment and then decrement the refcount, because there is no
>-   * _dbus_atomic_get (mirroring the fact that there's no InterlockedGet
>-   * on Windows). */
>-  _dbus_atomic_inc (&connection->refcount);
>-  tmp_refcount = _dbus_atomic_dec (&connection->refcount);
>-
>-  /* The caller should have one ref, and this function temporarily took
>-   * one more, which is reflected in this count even though we already
>-   * released it (relying on the caller's ref) due to _dbus_atomic_dec
>-   * semantics */
>-  _dbus_assert (tmp_refcount >= 2);
>+  refcount = _dbus_atomic_get (&connection->refcount);
>+  /* The caller should have at least one ref */
>+  _dbus_assert (refcount >= 1);
> 
>-  if (tmp_refcount == 2)
>+  if (refcount == 1)
>     _dbus_connection_close_possibly_shared_and_unlock (connection);
>   else
>     CONNECTION_UNLOCK (connection);
>-- 
>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.