Merge lp:~mardy/libsignon-glib/context-lp1607799 into lp:libsignon-glib

[Alberto Mardegan]

Lib: don't use g_idle_add, respect thread affinity

After commit 4e85baaf483268d04bbf835bebeac4ae30c7c327 libsignon-glib
stopped working when used in a thread on which
g_main_context_push_thread_default() had been called: the reason is that
g_idle_add()'s callback is always involved on the default GMainContext,
and not on the one used by the current thread.

We fix this problem by using g_source directly.

Lib: don't use g_idle_add, respect thread affinity

After commit 4e85baaf483268d04bbf835bebeac4ae30c7c327 libsignon-glib
stopped working when used in a thread on which
g_main_context_push_thread_default() had been called: the reason is that
g_idle_add()'s callback is always involved on the default GMainContext,
and not on the one used by the current thread.

We fix this problem by using g_source directly.

[lp:~mardy/libsignon-glib/context-lp1607799]

164. By Alberto Mardegan on 2016-08-01

Changelog

* Merge from upstream.
  - Lib: don't use g_idle_add, respect thread affinity (LP: #1607799)

[Marcus Tomlinson (marcustomlinson)]

Excellent work, thanks mardy.

review: Approve

[lp:~mardy/libsignon-glib/context-lp1607799]

165. By Alberto Mardegan on 2016-08-02

Merge from upstream

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-18 07:43:45 +0000
+++ debian/changelog	2016-08-02 14:09:08 +0000
@@ -1,3 +1,10 @@
+libsignon-glib (1.14+16.10.20160718-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream.
+    - Lib: don't use g_idle_add, respect thread affinity (LP: #1607799)
+
+ -- Alberto Mardegan <[e-mail]>  Mon, 01 Aug 2016 16:19:55 +0300
+
 libsignon-glib (1.14+16.10.20160718-0ubuntu1) yakkety; urgency=medium
 
   * Merge from upstream proposed branch

=== modified file 'libsignon-glib/signon-proxy.c'
--- libsignon-glib/signon-proxy.c	2016-06-22 07:53:40 +0000
+++ libsignon-glib/signon-proxy.c	2016-08-02 14:09:08 +0000
@@ -36,7 +36,7 @@
 typedef struct {
     gpointer self;
     GSList *callbacks;
-    guint idle_id;
+    GSource *idle_source;
 } SignonReadyData;
 
 static void
@@ -95,10 +95,11 @@
         GError error = { 555, 666, "Object disposed" };
         signon_proxy_invoke_ready_callbacks (rd, &error);
     }
-    if (rd->idle_id > 0)
+    if (rd->idle_source)
     {
-        g_source_remove (rd->idle_id);
-        rd->idle_id = 0;
+        g_main_context_unref (g_source_get_context (rd->idle_source));
+        g_source_destroy (rd->idle_source);
+        rd->idle_source = NULL;
     }
     g_slice_free (SignonReadyData, rd);
 }
@@ -119,7 +120,8 @@
         signon_proxy_setup (SIGNON_PROXY (rd->self));
     }
 
-    rd->idle_id = 0;
+    g_main_context_unref (g_source_get_context (rd->idle_source));
+    rd->idle_source = NULL;
     return FALSE;
 }
 
@@ -158,16 +160,20 @@
         rd = g_slice_new (SignonReadyData);
         rd->self = object;
         rd->callbacks = NULL;
-        rd->idle_id = 0;
+        rd->idle_source = NULL;
         g_object_set_qdata_full ((GObject *)object, quark, rd,
                                  (GDestroyNotify)signon_ready_data_free);
     }
 
     rd->callbacks = g_slist_append (rd->callbacks, cb);
-    if (rd->idle_id == 0)
+    if (!rd->idle_source)
     {
-        rd->idle_id =
-            g_idle_add ((GSourceFunc)signon_proxy_call_when_ready_idle, rd);
+        rd->idle_source = g_idle_source_new ();
+        g_source_set_callback (rd->idle_source,
+                               (GSourceFunc)signon_proxy_call_when_ready_idle,
+                               rd, NULL);
+        g_source_attach (rd->idle_source,
+                         g_main_context_ref_thread_default ());
     }
 }
 

=== modified file 'tests/check_signon.c'
--- tests/check_signon.c	2016-06-22 07:53:40 +0000
+++ tests/check_signon.c	2016-08-02 14:09:08 +0000
@@ -1064,29 +1064,6 @@
     signon_identity_remove(idty, identity_remove_cb, NULL);
     g_main_loop_run (main_loop);
 
-    GHashTable *methods = create_methods_hashtable();
-
-    gchar username[] = "James Bond";
-    gchar secret[] = "007";
-    gchar caption[] = "caption";
-
-    signon_identity_store_credentials_with_args (idty,
-                                                 username,
-                                                 secret,
-                                                 1,
-                                                 methods,
-                                                 caption,
-                                                 NULL,
-                                                 NULL,
-                                                 0,
-                                                 store_credentials_identity_cb,
-                                                 NULL);
-    g_hash_table_destroy (methods);
-    g_main_loop_run (main_loop);
-
-    signon_identity_remove(idty, identity_remove_cb, NULL);
-    g_main_loop_run (main_loop);
-
     /*
      * Try to remove existing identy
      * */