Attachment 46316 Details for Bug 36811 – [PATCH 1/5] dbus-gobject: wrap the GSList of registrations in a simple struct

[patch] [PATCH 1/5] dbus-gobject: wrap the GSList of registrations in a simple struct

0001-dbus-gobject-wrap-the-GSList-of-registrations-in-a-s.patch (text/plain), 6.30 KB, created by Simon McVittie on 2011-05-04 05:07:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-04 05:07:16 UTC

Size: 6.30 KB

patch

obsolete

>From 41aff5dee68987325db4e34b4ed51be9b2458c44 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 4 May 2011 10:45:58 +0100
>Subject: [PATCH 1/5] dbus-gobject: wrap the GSList of registrations in a
> simple struct
>
>For simplicity, the ObjectExport struct isn't freed until the object
>is actually destroyed, even if there are no more registrations.
>---
> dbus/dbus-gobject.c |   77 +++++++++++++++++++++++++++++++++-----------------
> 1 files changed, 51 insertions(+), 26 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index d28f61f..e9ea0c0 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -535,6 +535,10 @@ lookup_object_info_by_iface (GObject     *object,
> }
> 
> typedef struct {
>+    GSList *registrations;
>+} ObjectExport;
>+
>+typedef struct {
>     DBusGConnection *connection;
>     gchar *object_path;
>     GObject *object;
>@@ -542,6 +546,18 @@ typedef struct {
> 
> static void object_registration_object_died (gpointer user_data, GObject *dead);
> 
>+static void
>+object_export_free (ObjectExport *oe)
>+{
>+  g_slice_free (ObjectExport, oe);
>+}
>+
>+static ObjectExport *
>+object_export_new (void)
>+{
>+  return g_slice_new0 (ObjectExport);
>+}
>+
> static ObjectRegistration *
> object_registration_new (DBusGConnection *connection,
>                          const gchar *object_path,
>@@ -563,16 +579,16 @@ object_registration_free (ObjectRegistration *o)
> {
>   if (o->object != NULL)
>     {
>-      GSList *registrations;
>+      ObjectExport *oe;
> 
>       /* Ok, the object is still around; clear out this particular registration
>        * from the registrations list.
>        */
>-      registrations = g_object_steal_data (o->object, "dbus_glib_object_registrations");
>-      registrations = g_slist_remove (registrations, o);
>-
>-      if (registrations != NULL)
>-        g_object_set_data (o->object, "dbus_glib_object_registrations", registrations);
>+      oe = g_object_get_data (o->object, "dbus_glib_object_registrations");
>+      /* If the object has ever been exported, this should exist; it persists
>+       * until the object is actually freed. */
>+      g_assert (oe != NULL);
>+      oe->registrations = g_slist_remove (oe->registrations, o);
> 
>       g_object_weak_unref (o->object, object_registration_object_died, o);
>     }
>@@ -2127,15 +2143,19 @@ signal_emitter_marshaller (GClosure        *closure,
> 			   gpointer         marshal_data)
> {
>   DBusGSignalClosure *sigclosure;
>-  GSList *registrations, *iter;
>+  const ObjectExport *oe;
>+  const GSList *iter;
> 
>   sigclosure = (DBusGSignalClosure *) closure;
> 
>   g_assert (retval == NULL);
> 
>-  registrations = g_object_get_data (sigclosure->object, "dbus_glib_object_registrations");
>+  oe = g_object_get_data (sigclosure->object, "dbus_glib_object_registrations");
>+  /* If the object has ever been exported, this should exist; it persists until
>+   * the object is actually freed. */
>+  g_assert (oe != NULL);
> 
>-  for (iter = registrations; iter; iter = iter->next)
>+  for (iter = oe->registrations; iter; iter = iter->next)
>     {
>       ObjectRegistration *o = iter->data;
> 
>@@ -2486,18 +2506,21 @@ void
> dbus_g_connection_unregister_g_object (DBusGConnection *connection,
>                                        GObject *object)
> {
>-  GSList *registrations, *iter;
>+  ObjectExport *oe = g_object_get_data (object, "dbus_glib_object_registrations");
>+  GSList *registrations;
>+
>+  g_return_if_fail (oe != NULL);
>+
>+  g_return_if_fail (oe->registrations != NULL);
> 
>   /* Copy the list before iterating it: it will be modified in
>    * object_registration_free() each time an object path is unregistered.
>    */
>-  registrations = g_slist_copy (g_object_get_data (object, "dbus_glib_object_registrations"));
>-
>-  g_return_if_fail (registrations != NULL);
>-
>-  for (iter = registrations; iter; iter = iter->next)
>+  for (registrations = g_slist_copy (oe->registrations);
>+      registrations != NULL;
>+      registrations = g_slist_delete_link (registrations, registrations))
>     {
>-      ObjectRegistration *o = iter->data;
>+      ObjectRegistration *o = registrations->data;
> 
>       if (o->connection != connection)
>         continue;
>@@ -2505,8 +2528,6 @@ dbus_g_connection_unregister_g_object (DBusGConnection *connection,
>       dbus_connection_unregister_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (o->connection),
>           o->object_path);
>     }
>-
>-  g_slist_free (registrations);
> }
> 
> /**
>@@ -2532,8 +2553,9 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>                                      const char            *at_path,
>                                      GObject               *object)
> {
>+  ObjectExport *oe;
>   GList *info_list;
>-  GSList *registrations, *iter;
>+  GSList *iter;
>   ObjectRegistration *o;
>   gboolean is_first_registration;
> 
>@@ -2541,12 +2563,14 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>   g_return_if_fail (g_variant_is_object_path (at_path));
>   g_return_if_fail (G_IS_OBJECT (object));
> 
>-  /* This is a GSList of ObjectRegistration*.
>-   * After this point you must "goto put_back" to give this back to
>+  /* After this point you must "goto put_back" to give this back to
>    * the object. */
>-  registrations = g_object_steal_data (object, "dbus_glib_object_registrations");
>+  oe = g_object_steal_data (object, "dbus_glib_object_registrations");
>+
>+  if (oe == NULL)
>+    oe = object_export_new ();
> 
>-  for (iter = registrations; iter; iter = iter->next)
>+  for (iter = oe->registrations; iter; iter = iter->next)
>     {
>       o = iter->data;
> 
>@@ -2555,7 +2579,7 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>         goto put_back;
>     }
> 
>-  is_first_registration = registrations == NULL;
>+  is_first_registration = (oe->registrations == NULL);
> 
>   /* This is used to hook up signals below, but we do this check
>    * before trying to register the object to make sure we have
>@@ -2597,10 +2621,11 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>       g_list_free (info_list);
>     }
> 
>-  registrations = g_slist_append (registrations, o);
>+  oe->registrations = g_slist_append (oe->registrations, o);
> 
> put_back:
>-  g_object_set_data (object, "dbus_glib_object_registrations", registrations);
>+  g_object_set_data_full (object, "dbus_glib_object_registrations", oe,
>+      (GDestroyNotify) object_export_free);
> }
> 
> /**
>-- 
>1.7.4.4
>

Actions: View | Splinter Review

Attachments on bug 36811: 46316 | 46317 | 46318 | 46319 | 46320 | 46538

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.