Merge lp:~marmuta/unity-greeter/kill-onboard-with-sigterm into lp:unity-greeter

[marmuta]

Kill Onboard with SIGTERM and let it release pressed keys, see bug #978430. On failure time out and kill it with SIGKILL as before.

$ tail /var/log/lightdm/x-0-greeter.log
[+13.48s] DEBUG: Authentication complete for user user with return code 0
[+13.49s] DEBUG: menubar.vala:208: Killing Onboard
[+13.49s] DEBUG: menubar.vala:24: sending SIGTERM to pid 16263
[+13.54s] DEBUG: menubar.vala:41: child 16263 exited status 0
[+13.54s] DEBUG: Starting session ubuntu
[+13.54s] DEBUG: Wrote 18 bytes to daemon
[+13.54s] DEBUG: Read 8 bytes from daemon
[+13.54s] DEBUG: Read 4 bytes from daemon

The call to main_window.before_session_start() in unity-greeter.vala is just a suggestion. I didn't find a better spot that is reliably called when the greeter is shut down. I've tried to just change the kill statement in the destructor of MenuBar, but apparently it is never reached when starting a session. It looks like the greeter is killed and Onboard with it before any cleanup is done.

Unmerged revisions

386. By marmuta on 2012-04-13

Kill Onboard with SIGTERM to allow it to release still pressed keys, e.g. Return (LP: #978430).

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2012-03-13 14:27:50 +0000
+++ src/main-window.vala	2012-04-13 10:37:25 +0000
@@ -93,6 +93,11 @@
         }
     }
 
+    public void before_session_start()
+    {
+        menubar.kill_onboard();
+    }
+
     private void monitors_changed_cb (Gdk.Screen screen)
     {
         debug ("Screen is %dx%d pixels", screen.get_width (), screen.get_height ());

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-03-21 20:00:39 +0000
+++ src/menubar.vala	2012-04-13 10:37:25 +0000
@@ -18,6 +18,43 @@
  *          Michael Terry <[e-mail]>
  */
 
+class Terminator
+{
+    public static void terminate(Pid pid) {
+        debug("sending SIGTERM to pid %u", pid);
+        Posix.kill (pid, Posix.SIGTERM);
+        if (waitpid_timeout(pid) == 0)
+        {
+            debug("sending SIGKILL to pid %u", pid);
+            Posix.kill (pid, Posix.SIGKILL);
+            waitpid_timeout(pid);
+        }
+        Process.close_pid (pid);
+    }
+
+    private static int waitpid_timeout(Pid pid, int timeout = 3)
+    {
+        int result = 0;
+        MainLoop loop = new MainLoop();
+
+        ChildWatch.add (pid, (pid, status) => {
+            debug("child %u exited status %d", pid, status);
+            loop.quit();
+            result = pid;
+        });
+
+        Timeout.add_seconds(timeout, () => {
+            debug("child timed out!");
+            loop.quit();
+            return false;
+        });
+
+        loop.run();
+
+        return result;
+    }
+}
+
 private class IndicatorMenuItem : Gtk.MenuItem
 {
     public unowned Indicator.ObjectEntry entry;
@@ -161,11 +198,15 @@
 
     ~MenuBar ()
     {
+        kill_onboard();
+    }
+
+    public void kill_onboard()
+    {
         if (keyboard_pid != 0)
         {
-            Posix.kill (keyboard_pid, Posix.SIGKILL);
-            int status;
-            Posix.waitpid (keyboard_pid, out status, 0);
+            debug("Killing Onboard");
+            Terminator.terminate(keyboard_pid);
             keyboard_pid = 0;
         }
     }
@@ -358,7 +399,8 @@
                 Process.spawn_async_with_pipes (null,
                                                 argv,
                                                 null,
-                                                SpawnFlags.SEARCH_PATH,
+                                                SpawnFlags.SEARCH_PATH |
+                                                SpawnFlags.DO_NOT_REAP_CHILD,
                                                 null,
                                                 out keyboard_pid,
                                                 null,

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-03-27 06:00:03 +0000
+++ src/unity-greeter.vala	2012-04-13 10:37:25 +0000
@@ -407,6 +407,8 @@
         c = null;
         refresh_background (Gdk.Screen.get_default (), background_surface);
 
+        main_window.before_session_start();
+
         try
         {
             greeter.start_session_sync (user_list.session);