Attachment 84401 Details for Bug 68390 – TpConnectionManager: add more debug for tp_list_connection_managers()

[patch] TpConnectionManager: add more debug for tp_list_connection_managers()

0002-TpConnectionManager-add-more-debug-for-tp_list_conne.patch (text/plain), 4.54 KB, created by Simon McVittie on 2013-08-21 17:28:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-08-21 17:28:44 UTC

Size: 4.54 KB

patch

obsolete

>From 0ff6244ae74e44661796a92626c85e413764efae Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 20 Aug 2013 20:36:46 +0100
>Subject: [PATCH 2/3] TpConnectionManager: add more debug for
> tp_list_connection_managers()
>
>Based on a patch by Guillaume Desmottes.
>---
> telepathy-glib/connection-manager.c | 48 +++++++++++++++++++++++++++++++++----
> 1 file changed, 43 insertions(+), 5 deletions(-)
>
>diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
>index 2dd1c4e..4064671 100644
>--- a/telepathy-glib/connection-manager.c
>+++ b/telepathy-glib/connection-manager.c
>@@ -1789,20 +1789,36 @@ list_context_unref (_ListContext *list_context)
> }
> 
> static void
>-tp_list_connection_managers_cm_prepared (GObject *source G_GNUC_UNUSED,
>-    GAsyncResult *result G_GNUC_UNUSED,
>+tp_list_connection_managers_cm_prepared (GObject *source,
>+    GAsyncResult *result,
>     gpointer user_data)
> {
>   _ListContext *list_context = user_data;
>+  GError *error = NULL;
>+  TpConnectionManager *cm = TP_CONNECTION_MANAGER (source);
> 
>-  /* ignore the result here - all we guarantee is that the CM is ready
>-   * *if possible* */
>+  if (tp_proxy_prepare_finish (source, result, &error))
>+    {
>+      DEBUG ("%s: prepared", cm->name);
>+    }
>+  else
>+    {
>+      DEBUG ("%s: failed to prepare, continuing: %s #%d: %s", cm->name,
>+          g_quark_to_string (error->domain), error->code, error->message);
>+      g_clear_error (&error);
>+      /* other than that, ignore it - all we guarantee is that
>+       * the CM is ready *if possible* */
>+    }
> 
>-  if ((--list_context->cms_to_ready) == 0)
>+  list_context->cms_to_ready--;
>+
>+  if (list_context->cms_to_ready == 0)
>     {
>       TpConnectionManager **cms;
>       guint n_cms = list_context->arr->len;
> 
>+      DEBUG ("We've prepared as many as possible of %u CMs", n_cms);
>+
>       g_assert (list_context->callback != NULL);
> 
>       g_ptr_array_add (list_context->arr, NULL);
>@@ -1819,6 +1835,11 @@ tp_list_connection_managers_cm_prepared (GObject *source G_GNUC_UNUSED,
> 
>       list_context->callback = NULL;
>     }
>+  else
>+    {
>+      DEBUG ("We still need to prepare %" G_GSIZE_FORMAT " CM(s)",
>+          list_context->cms_to_ready);
>+    }
> 
>   list_context_unref (list_context);
> }
>@@ -1832,17 +1853,27 @@ tp_list_connection_managers_got_names (TpDBusDaemon *bus_daemon,
> {
>   _ListContext *list_context = user_data;
>   const gchar * const *name_iter;
>+  const gchar *method;
>+
>+  if (list_context->getting_names)
>+    method = "ListNames";
>+  else
>+    method = "ListActivatableNames";
> 
>   /* The TpProxy APIs we use guarantee this */
>   g_assert (weak_object != NULL || !list_context->had_weak_object);
> 
>   if (error != NULL)
>     {
>+      DEBUG ("%s failed: %s #%d: %s", method,
>+          g_quark_to_string (error->domain), error->code, error->message);
>       list_context->callback (NULL, 0, error, list_context->user_data,
>           weak_object);
>       return;
>     }
> 
>+  DEBUG ("%s succeeded", method);
>+
>   for (name_iter = names; name_iter != NULL && *name_iter != NULL; name_iter++)
>     {
>       const gchar *name;
>@@ -1853,6 +1884,7 @@ tp_list_connection_managers_got_names (TpDBusDaemon *bus_daemon,
>         continue;
> 
>       name = *name_iter + list_context->base_len;
>+      DEBUG ("  found CM: %s", name);
> 
>       if (g_hash_table_lookup (list_context->table, name) == NULL)
>         {
>@@ -1877,16 +1909,21 @@ tp_list_connection_managers_got_names (TpDBusDaemon *bus_daemon,
>       list_context->cms_to_ready = list_context->arr->len;
>       list_context->refcount += list_context->cms_to_ready;
> 
>+      DEBUG ("Total of %" G_GSIZE_FORMAT " CMs to be prepared",
>+          list_context->cms_to_ready);
>+
>       for (i = 0; i < list_context->cms_to_ready; i++)
>         {
>           TpConnectionManager *cm = g_ptr_array_index (list_context->arr, i);
> 
>+          DEBUG ("  preparing %s", cm->name);
>           tp_proxy_prepare_async (cm, NULL,
>               tp_list_connection_managers_cm_prepared, list_context);
>         }
>     }
>   else
>     {
>+      DEBUG ("Calling ListNames");
>       list_context->getting_names = TRUE;
>       list_context->refcount++;
>       tp_dbus_daemon_list_names (bus_daemon, 2000,
>@@ -1947,6 +1984,7 @@ tp_list_connection_managers (TpDBusDaemon *bus_daemon,
>       g_object_add_weak_pointer (weak_object, &list_context->weak_object);
>     }
> 
>+  DEBUG ("Calling ListActivatableNames");
>   tp_dbus_daemon_list_activatable_names (bus_daemon, 2000,
>       tp_list_connection_managers_got_names, list_context,
>       (GDestroyNotify) list_context_unref, weak_object);
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68390: 84400 | 84401 | 84402 | 86446

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.