Merge lp:~ted/ubuntu-app-launch/lp1495871-unref-context into lp:ubuntu-app-launch/15.10

[Ted Gould]

Ensure all pending events on the context are complete before unref'ing it.

So while we create a context to ensure that we can capture all the events to the CGManager connection it seems that some of those events can get stuck on the context, and they need to get processed to complete. Otherwise they hold onto references of things, and that actually results in a g_spawn getting left around because it never gets free'd. (actually of the context itself, which is a bit confusing, but eh, refcounting is fun)

Also brought in the pid tools branch because it made testing this much, much easier. You can use the ubuntu-app-list-pids tool to cause the FD to be leaked and then see it fixed with something like (assuming you've done ubuntu-app-launch firefox):

valgrind --track-fds=yes ./ubuntu-app-list-pids firefox

Which on trunk will have 6 FDs left over, but with this branch only 5. (which come from globals that we don't control)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/18/rebuild

review: Approve (continuous-integration)

[lp:~ted/ubuntu-app-launch/lp1495871-unref-context]

215. By Ted Gould on 2015-12-07

Merge FTBFS

Unmerged revisions

215. By Ted Gould on 2015-12-07

Merge FTBFS

214. By Ted Gould on 2015-09-16

Fix GDocs syntax for warning

213. By Ted Gould on 2015-09-16

Make sure get and set use the same value

212. By Ted Gould on 2015-09-16

Ensure that we process all the events on the context before unref'ing it. There may be references in the events.

211. By Ted Gould on 2015-09-15

Grabbing the pid tools branch

210. By Ted Gould on 2015-09-15

Easier to read an a cast that is needed

209. By Ted Gould on 2015-09-15

Plug leaking context

=== modified file 'helpers-shared.c'
--- helpers-shared.c	2015-07-15 02:32:54 +0000
+++ helpers-shared.c	2015-09-16 14:36:19 +0000
@@ -145,6 +145,8 @@
 	cgroup_manager_connection_core_cb(g_dbus_connection_new_for_address_finish, res, (cgm_connection_t *)data);
 }
 
+G_DEFINE_QUARK(CGMANAGER_CONTEXT, cgmanager_context);
+
 /* Get the connection to the cgroup manager */
 GDBusConnection *
 cgroup_manager_connection (void)
@@ -191,7 +193,9 @@
 	g_main_context_pop_thread_default(context);
 
 	if (!use_session_bus && connection.con != NULL) {
-		g_object_set_data(G_OBJECT(connection.con), "cgmanager-context", context);
+		g_object_set_qdata(G_OBJECT(connection.con),
+		                   cgmanager_context_quark(),
+		                   context);
 	} else {
 		g_main_context_unref(context);
 	}
@@ -213,7 +217,7 @@
 	if (cgmanager == NULL)
 		return;
 
-	GMainContext * creationcontext = g_object_get_data(G_OBJECT(cgmanager), "cgmanager-context");
+	GMainContext * creationcontext = g_object_get_qdata(G_OBJECT(cgmanager), cgmanager_context_quark());
 	if (creationcontext == NULL) {
 		g_object_unref(cgmanager);
 		return;
@@ -228,6 +232,11 @@
 	}
 
 	g_object_unref(cgmanager);
+
+	while (g_main_context_pending(creationcontext)) {
+		g_main_context_iteration(creationcontext, TRUE /* may block */);
+	}
+
 	g_main_context_unref(creationcontext);
 }
 

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.h'
--- libubuntu-app-launch/ubuntu-app-launch.h	2015-09-16 14:36:19 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.h	2015-09-16 14:36:19 +0000
@@ -394,7 +394,7 @@
  * Checks to see if an application is running and returns
  * the PIDs associated with it.
  *
- * Return Value: (transfer full) (element-type GLib.Pid) A list
+ * Return Value: (transfer full) (element-type GLib.Pid): A list
  *   of PIDs associated with @appid, empty if not running.
  */
 GList *     ubuntu_app_launch_get_pids                 (const gchar *                     appid);