1
=== modified file 'src/unity-mir/qmirserver.cpp'
2
--- src/unity-mir/qmirserver.cpp	2014-04-09 15:47:05 +0000
3
+++ src/unity-mir/qmirserver.cpp	2014-05-06 12:35:11 +0000
4
@@ -19,6 +19,7 @@
5
19
#include <mir/abnormal_exit.h>
19
#include <mir/abnormal_exit.h>
6
20
#include <mir/default_server_configuration.h>
20
#include <mir/default_server_configuration.h>
7
21
#include <mir/display_server.h>
21
#include <mir/display_server.h>
8
22
#include <mir/main_loop.h>
9
22
23
10
23
// Platform API
24
// Platform API
11
24
#include <application/ubuntu_application_api_mirserver_priv.h>
25
#include <application/ubuntu_application_api_mirserver_priv.h>
12
@@ -30,9 +31,11 @@
13
30
31
14
31
// Std
32
// Std
15
32
#include <chrono>
33
#include <chrono>
16
34
#include <csignal>
17
33
#include <thread>
35
#include <thread>
18
34
36
19
35
// local
37
// local
20
38
#include "logging.h"
21
36
#include "qmirserver.h"
39
#include "qmirserver.h"
22
37
40
23
38
QMirServer::QMirServer(int argc, const char* argv[], QObject *parent)
41
QMirServer::QMirServer(int argc, const char* argv[], QObject *parent)
24
@@ -53,19 +56,35 @@
25
53
    auto argv = m_argv;
56
    auto argv = m_argv;
26
54
    auto config = new ShellServerConfiguration(m_argc, m_argv);
57
    auto config = new ShellServerConfiguration(m_argc, m_argv);
27
55
    std::thread *t;
58
    std::thread *t;
28
59
    bool mirServerShutDown = false;
29
56
60
31
57
    mir::run_mir(*config, [config, &client, &argc, &argv, &t](mir::DisplayServer& server) {
61
    mir::run_mir(*config, [&](mir::DisplayServer &server) {
32
58
        ua_ui_mirserver_init(*config);
62
        ua_ui_mirserver_init(*config);
33
59
63
34
64
        // Mir initiates shutdown on SIGINT & SIGTERM, need to distinguish that shutdown from a
35
65
        // client-initiated shutdown. Do this by installing a custom signal handler that is run
36
66
        // after Mir's initiate-shutdown handler is called.
37
67
        config->the_main_loop()->register_signal_handler(
38
68
        {SIGINT, SIGTERM},
39
69
        [&](int)
40
70
        {
41
71
            DLOG("Mir-initiated shut down in progress");
42
72
            mirServerShutDown = true;
43
73
        });
44
74
45
60
        try {
75
        try {
46
61
            t = new std::thread([&]() {
76
            t = new std::thread([&]() {
47
62
                client (argc, argv, config);
77
                client (argc, argv, config);
49
63
                server.stop();
78
                if (!mirServerShutDown) {
50
79
                    DLOG("Qt-initiated shut down in progress");
51
80
                    server.stop();
52
81
                }
53
64
            });
82
            });
54
65
        } catch (...) {
83
        } catch (...) {
56
66
            qDebug() << "Exception caught, quitting";
84
            LOG("Exception caught, quitting");
57
67
        }
85
        }
58
68
    });
86
    });
59
87
60
69
    if (QCoreApplication::instance()) {
88
    if (QCoreApplication::instance()) {
61
70
        bool aboutToQuitSignaled = false;
89
        bool aboutToQuitSignaled = false;
62
71
        QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [&]() {
90
        QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [&]() {
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2014-05-06	Approve on 2014-05-06
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-06
Review via email: mp+218394@code.launchpad.net