Attachment 49103 Details for Bug 38005 – [PATCH 9/9] DBusMessage: always access refcount atomically, even for assertions/initial ref

[patch] [PATCH 9/9] DBusMessage: always access refcount atomically, even for assertions/initial ref

0009-DBusMessage-always-access-refcount-atomically-even-f.patch (text/plain), 2.84 KB, created by Simon McVittie on 2011-07-14 10:54:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-07-14 10:54:04 UTC

Size: 2.84 KB

patch

obsolete

>From fbdab36c743758fb678a1bf311fb9883854a7a0e Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 14 Jul 2011 17:20:21 +0100
>Subject: [PATCH 9/9] DBusMessage: always access refcount atomically, even for
> assertions/initial ref
>
>---
> dbus/dbus-message.c |   26 ++++++++++++++------------
> 1 files changed, 14 insertions(+), 12 deletions(-)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index a6426ba..a95ad0f 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -526,7 +526,8 @@ dbus_message_get_cached (void)
>   _dbus_assert (i < MAX_MESSAGE_CACHE_SIZE);
>   _dbus_assert (message != NULL);
> 
>-  _dbus_assert (message->refcount.value == 0);
>+  _dbus_assert (_dbus_atomic_get (&message->refcount) == 0);
>+
>   _dbus_assert (message->counters == NULL);
>   
>   _DBUS_UNLOCK (message_cache);
>@@ -586,8 +587,8 @@ dbus_message_cache_or_finalize (DBusMessage *message)
> {
>   dbus_bool_t was_cached;
>   int i;
>-  
>-  _dbus_assert (message->refcount.value == 0);
>+
>+  _dbus_assert (_dbus_atomic_get (&message->refcount) == 0);
> 
>   /* This calls application code and has to be done first thing
>    * without holding the lock
>@@ -649,8 +650,8 @@ dbus_message_cache_or_finalize (DBusMessage *message)
> #endif
> 
>  out:
>-  _dbus_assert (message->refcount.value == 0);
>-  
>+  _dbus_assert (_dbus_atomic_get (&message->refcount) == 0);
>+
>   _DBUS_UNLOCK (message_cache);
>   
>   if (!was_cached)
>@@ -1039,7 +1040,7 @@ dbus_message_get_reply_serial  (DBusMessage *message)
> static void
> dbus_message_finalize (DBusMessage *message)
> {
>-  _dbus_assert (message->refcount.value == 0);
>+  _dbus_assert (_dbus_atomic_get (&message->refcount) == 0);
> 
>   /* This calls application callbacks! */
>   _dbus_data_slot_list_free (&message->slot_list);
>@@ -1056,8 +1057,8 @@ dbus_message_finalize (DBusMessage *message)
>   dbus_free(message->unix_fds);
> #endif
> 
>-  _dbus_assert (message->refcount.value == 0);
>-  
>+  _dbus_assert (_dbus_atomic_get (&message->refcount) == 0);
>+
>   dbus_free (message);
> }
> 
>@@ -1076,7 +1077,7 @@ dbus_message_new_empty_header (void)
>   else
>     {
>       from_cache = FALSE;
>-      message = dbus_new (DBusMessage, 1);
>+      message = dbus_new0 (DBusMessage, 1);
>       if (message == NULL)
>         return NULL;
> #ifndef DBUS_DISABLE_CHECKS
>@@ -1088,8 +1089,9 @@ dbus_message_new_empty_header (void)
>       message->n_unix_fds_allocated = 0;
> #endif
>     }
>-  
>-  message->refcount.value = 1;
>+
>+  _dbus_atomic_inc (&message->refcount);
>+
>   message->byte_order = DBUS_COMPILER_BYTE_ORDER;
>   message->locked = FALSE;
> #ifndef DBUS_DISABLE_CHECKS
>@@ -1448,7 +1450,7 @@ dbus_message_copy (const DBusMessage *message)
>   if (retval == NULL)
>     return NULL;
> 
>-  retval->refcount.value = 1;
>+  _dbus_atomic_inc (&retval->refcount);
>   retval->byte_order = message->byte_order;
>   retval->locked = FALSE;
> #ifndef DBUS_DISABLE_CHECKS
>-- 
>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.