Attachment 51344 Details for Bug 37286 – [8/8 v3] add and use _dbus_connection_trace_ref

[patch] [8/8 v3] add and use _dbus_connection_trace_ref

0008-add-and-use-_dbus_connection_trace_ref.patch (text/plain), 3.72 KB, created by Simon McVittie on 2011-09-19 08:48:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-19 08:48:14 UTC

Size: 3.72 KB

patch

obsolete

>From af6b0d76742b0e91f1580d34457dab3ca245d9a3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 26 Jul 2011 16:35:57 +0100
>Subject: [PATCH 8/8] add and use _dbus_connection_trace_ref
>
>---
> dbus/dbus-connection.c |   59 ++++++++++++++++++++++++++++++++++++++---------
> 1 files changed, 47 insertions(+), 12 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 9123d8b..11d69d6 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -203,6 +203,27 @@
>  * @{
>  */
> 
>+#ifdef DBUS_ENABLE_VERBOSE_MODE
>+static void
>+_dbus_connection_trace_ref (DBusConnection *connection,
>+    int old_refcount,
>+    int new_refcount,
>+    const char *why)
>+{
>+  static int enabled = -1;
>+
>+  _dbus_trace_ref ("DBusConnection", connection, old_refcount, new_refcount,
>+      why, "DBUS_CONNECTION_TRACE", &enabled);
>+}
>+#else
>+#define _dbus_connection_trace_ref(c,o,n,w) \
>+  do \
>+  {\
>+    (void) (o); \
>+    (void) (n); \
>+  } while (0)
>+#endif
>+
> /**
>  * Internal struct representing a message filter function 
>  */
>@@ -1381,7 +1402,8 @@ _dbus_connection_new_for_transport (DBusTransport *transport)
>   _dbus_transport_ref (transport);
> 
>   CONNECTION_UNLOCK (connection);
>-  
>+
>+  _dbus_connection_trace_ref (connection, 0, 1, "new_for_transport");
>   return connection;
>   
>  error:
>@@ -1428,13 +1450,17 @@ _dbus_connection_new_for_transport (DBusTransport *transport)
>  */
> DBusConnection *
> _dbus_connection_ref_unlocked (DBusConnection *connection)
>-{  
>+{
>+  dbus_int32_t old_refcount;
>+
>   _dbus_assert (connection != NULL);
>   _dbus_assert (connection->generation == _dbus_current_generation);
> 
>   HAVE_LOCK_CHECK (connection);
> 
>-  _dbus_atomic_inc (&connection->refcount);
>+  old_refcount = _dbus_atomic_inc (&connection->refcount);
>+  _dbus_connection_trace_ref (connection, old_refcount, old_refcount + 1,
>+      "ref_unlocked");
> 
>   return connection;
> }
>@@ -1448,15 +1474,18 @@ _dbus_connection_ref_unlocked (DBusConnection *connection)
> void
> _dbus_connection_unref_unlocked (DBusConnection *connection)
> {
>-  dbus_bool_t last_unref;
>+  dbus_int32_t old_refcount;
> 
>   HAVE_LOCK_CHECK (connection);
>-  
>+
>   _dbus_assert (connection != NULL);
> 
>-  last_unref = (_dbus_atomic_dec (&connection->refcount) == 1);
>+  old_refcount = _dbus_atomic_dec (&connection->refcount);
> 
>-  if (last_unref)
>+  _dbus_connection_trace_ref (connection, old_refcount, old_refcount - 1,
>+      "unref_unlocked");
>+
>+  if (old_refcount == 1)
>     _dbus_connection_last_unref (connection);
> }
> 
>@@ -2633,10 +2662,13 @@ dbus_connection_open_private (const char     *address,
> DBusConnection *
> dbus_connection_ref (DBusConnection *connection)
> {
>+  dbus_int32_t old_refcount;
>+
>   _dbus_return_val_if_fail (connection != NULL, NULL);
>   _dbus_return_val_if_fail (connection->generation == _dbus_current_generation, NULL);
>-
>-  _dbus_atomic_inc (&connection->refcount);
>+  old_refcount = _dbus_atomic_inc (&connection->refcount);
>+  _dbus_connection_trace_ref (connection, old_refcount, old_refcount + 1,
>+      "ref");
> 
>   return connection;
> }
>@@ -2765,14 +2797,17 @@ _dbus_connection_last_unref (DBusConnection *connection)
> void
> dbus_connection_unref (DBusConnection *connection)
> {
>-  dbus_bool_t last_unref;
>+  dbus_int32_t old_refcount;
> 
>   _dbus_return_if_fail (connection != NULL);
>   _dbus_return_if_fail (connection->generation == _dbus_current_generation);
> 
>-  last_unref = (_dbus_atomic_dec (&connection->refcount) == 1);
>+  old_refcount = _dbus_atomic_dec (&connection->refcount);
>+
>+  _dbus_connection_trace_ref (connection, old_refcount, old_refcount - 1,
>+      "unref");
> 
>-  if (last_unref)
>+  if (old_refcount == 1)
>     {
> #ifndef DBUS_DISABLE_CHECKS
>       if (_dbus_transport_get_is_connected (connection->transport))
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 37286: 46808 | 46809 | 46810 | 46811 | 46812 | 46813 | 46814 | 48344 | 48345 | 48346 | 48347 | 51336 | 51337 | 51339 | 51340 | 51341 | 51342 | 51343 | 51344 | 56984

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.