Attachment 48335 Details for Bug 38005 – [PATCH 1/8] DBusPendingCall: exclusively use atomic operations on the refcount

[patch] [PATCH 1/8] DBusPendingCall: exclusively use atomic operations on the refcount

0001-DBusPendingCall-exclusively-use-atomic-operations-on.patch (text/plain), 2.86 KB, created by Simon McVittie on 2011-06-23 06:46:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-23 06:46:20 UTC

Size: 2.86 KB

patch

obsolete

>From cddc5184883efb57e03ed83321af9a1a2381aa62 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 23 Jun 2011 13:08:14 +0100
>Subject: [PATCH 1/8] DBusPendingCall: exclusively use atomic operations on
> the refcount
>
>Same reasoning as for fd.o #38005, commit 50732523a7.
>---
> dbus/dbus-pending-call.c |   43 ++++++++++---------------------------------
> 1 files changed, 10 insertions(+), 33 deletions(-)
>
>diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
>index 70392b7..cfb2baf 100644
>--- a/dbus/dbus-pending-call.c
>+++ b/dbus/dbus-pending-call.c
>@@ -133,8 +133,8 @@ _dbus_pending_call_new_unlocked (DBusConnection    *connection,
>     {
>       pending->timeout = NULL;
>     }
>-      
>-  pending->refcount.value = 1;
>+
>+  _dbus_atomic_inc (&pending->refcount);
>   pending->connection = connection;
>   _dbus_connection_ref_unlocked (pending->connection);
> 
>@@ -374,8 +374,8 @@ _dbus_pending_call_set_timeout_error_unlocked (DBusPendingCall *pending,
> DBusPendingCall *
> _dbus_pending_call_ref_unlocked (DBusPendingCall *pending)
> {
>-  pending->refcount.value += 1;
>-  
>+  _dbus_atomic_inc (&pending->refcount);
>+
>   return pending;
> }
> 
>@@ -433,15 +433,14 @@ _dbus_pending_call_last_unref (DBusPendingCall *pending)
> void
> _dbus_pending_call_unref_and_unlock (DBusPendingCall *pending)
> {
>-  dbus_bool_t last_unref;
>-  
>-  _dbus_assert (pending->refcount.value > 0);
>+  dbus_int32_t old_refcount;
> 
>-  pending->refcount.value -= 1;
>-  last_unref = pending->refcount.value == 0;
>+  old_refcount = _dbus_atomic_dec (&pending->refcount);
>+  _dbus_assert (old_refcount > 0);
> 
>   CONNECTION_UNLOCK (pending->connection);
>-  if (last_unref)
>+
>+  if (old_refcount == 1)
>     _dbus_pending_call_last_unref (pending);
> }
> 
>@@ -554,19 +553,8 @@ dbus_pending_call_ref (DBusPendingCall *pending)
> {
>   _dbus_return_val_if_fail (pending != NULL, NULL);
> 
>-  /* The connection lock is better than the global
>-   * lock in the atomic increment fallback
>-   */
>-#ifdef DBUS_HAVE_ATOMIC_INT
>   _dbus_atomic_inc (&pending->refcount);
>-#else
>-  CONNECTION_LOCK (pending->connection);
>-  _dbus_assert (pending->refcount.value > 0);
> 
>-  pending->refcount.value += 1;
>-  CONNECTION_UNLOCK (pending->connection);
>-#endif
>-  
>   return pending;
> }
> 
>@@ -583,19 +571,8 @@ dbus_pending_call_unref (DBusPendingCall *pending)
> 
>   _dbus_return_if_fail (pending != NULL);
> 
>-  /* More efficient to use the connection lock instead of atomic
>-   * int fallback if we lack atomic int decrement
>-   */
>-#ifdef DBUS_HAVE_ATOMIC_INT
>   last_unref = (_dbus_atomic_dec (&pending->refcount) == 1);
>-#else
>-  CONNECTION_LOCK (pending->connection);
>-  _dbus_assert (pending->refcount.value > 0);
>-  pending->refcount.value -= 1;
>-  last_unref = pending->refcount.value == 0;
>-  CONNECTION_UNLOCK (pending->connection);
>-#endif
>-  
>+
>   if (last_unref)
>     _dbus_pending_call_last_unref(pending);
> }
>-- 
>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.