Merge lp:~gerboland/unity-mir/shutdown-crash-fix3 into lp:unity-mir/devel-mir-next

[Gerry Boland]

Fix crash on Mir-initiated shutdown, where stop() was being called on an already shutting-down server.

Mir initiates shutdown on SIGINT & SIGTERM, need to distinguish that shutdown from a client-initiated shutdown. Do this by installing a custom signal handler that is run after Mir's initiate-shutdown handler is called, so that we only call server.stop() on a client-initiated shutdown.

Fix crash on Mir-initiated shutdown, where stop() was being called on an already shutting-down server

To test, need to cover 2 use-cases:
1. Mir-initiated shutdown: run unity8 manually in shell, then hit Ctrl+C - should not crash
2. Qt-initiated shutdown: the first-run wizard, when it has completed, calls Qt.quit() on itself. This should cleanly shutdown the process.

[lp:~gerboland/unity-mir/shutdown-crash-fix3]

221. By Gerry Boland on 2014-05-06

bump

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gerboland/unity-mir/shutdown-crash-fix3]

222. By Gerry Boland on 2014-05-06

Missing csignal header

223. By Gerry Boland on 2014-05-06

Add Mir main_loop.h header

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:222
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/3/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yeah, tested both unity8 and the wizard and things are better.

review: Approve

=== modified file 'src/unity-mir/qmirserver.cpp'
--- src/unity-mir/qmirserver.cpp	2014-04-09 15:47:05 +0000
+++ src/unity-mir/qmirserver.cpp	2014-05-06 12:35:11 +0000
@@ -19,6 +19,7 @@
 #include <mir/abnormal_exit.h>
 #include <mir/default_server_configuration.h>
 #include <mir/display_server.h>
+#include <mir/main_loop.h>
 
 // Platform API
 #include <application/ubuntu_application_api_mirserver_priv.h>
@@ -30,9 +31,11 @@
 
 // Std
 #include <chrono>
+#include <csignal>
 #include <thread>
 
 // local
+#include "logging.h"
 #include "qmirserver.h"
 
 QMirServer::QMirServer(int argc, const char* argv[], QObject *parent)
@@ -53,19 +56,35 @@
     auto argv = m_argv;
     auto config = new ShellServerConfiguration(m_argc, m_argv);
     std::thread *t;
+    bool mirServerShutDown = false;
 
-    mir::run_mir(*config, [config, &client, &argc, &argv, &t](mir::DisplayServer& server) {
+    mir::run_mir(*config, [&](mir::DisplayServer &server) {
         ua_ui_mirserver_init(*config);
 
+        // Mir initiates shutdown on SIGINT & SIGTERM, need to distinguish that shutdown from a
+        // client-initiated shutdown. Do this by installing a custom signal handler that is run
+        // after Mir's initiate-shutdown handler is called.
+        config->the_main_loop()->register_signal_handler(
+        {SIGINT, SIGTERM},
+        [&](int)
+        {
+            DLOG("Mir-initiated shut down in progress");
+            mirServerShutDown = true;
+        });
+
         try {
             t = new std::thread([&]() {
                 client (argc, argv, config);
-                server.stop();
+                if (!mirServerShutDown) {
+                    DLOG("Qt-initiated shut down in progress");
+                    server.stop();
+                }
             });
         } catch (...) {
-            qDebug() << "Exception caught, quitting";
+            LOG("Exception caught, quitting");
         }
     });
+
     if (QCoreApplication::instance()) {
         bool aboutToQuitSignaled = false;
         QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [&]() {