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

[Gerry Boland]

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

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

221. By Gerry Boland on 2014-05-06

bump

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

Unmerged revisions

=== 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 11:31:45 +0000
@@ -33,6 +33,7 @@
 #include <thread>
 
 // local
+#include "logging.h"
 #include "qmirserver.h"
 
 QMirServer::QMirServer(int argc, const char* argv[], QObject *parent)
@@ -53,19 +54,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, [&]() {