1
=== modified file 'tools/CMakeLists.txt'
2
--- tools/CMakeLists.txt	2014-03-21 14:31:17 +0000
3
+++ tools/CMakeLists.txt	2015-07-01 10:55:15 +0000
4
@@ -1,6 +1,7 @@
5
1
add_executable(${SCOPE_TOOL}
1
add_executable(${SCOPE_TOOL}
6
2
    scopetool.cpp
2
    scopetool.cpp
7
3
    registry-tracker.cpp
3
    registry-tracker.cpp
8
4
    unix-signal-handler.cpp
9
4
    )
5
    )
10
5
6
11
6
qt5_use_modules(${SCOPE_TOOL} Qml Quick)
7
qt5_use_modules(${SCOPE_TOOL} Qml Quick)
12
7
8
13
=== modified file 'tools/scopetool.cpp'
14
--- tools/scopetool.cpp	2014-09-04 11:36:55 +0000
15
+++ tools/scopetool.cpp	2015-07-01 10:55:15 +0000
16
@@ -32,6 +32,7 @@
17
32
// local
32
// local
18
33
#include <paths.h>
33
#include <paths.h>
19
34
#include "registry-tracker.h"
34
#include "registry-tracker.h"
20
35
#include "unix-signal-handler.h"
21
35
36
22
36
37
23
37
int main(int argc, char *argv[])
38
int main(int argc, char *argv[])
24
@@ -96,6 +97,11 @@
25
96
97
26
97
    view->show();
98
    view->show();
27
98
99
28
100
    UnixSignalHandler signal_handler([]{
29
101
        QGuiApplication::exit(0);
30
102
    });
31
103
    signal_handler.setupUnixSignalHandlers();
32
104
33
99
    int result = application->exec();
105
    int result = application->exec();
34
100
106
35
101
    delete view;
107
    delete view;
36
102
108
37
=== added file 'tools/unix-signal-handler.cpp'
38
--- tools/unix-signal-handler.cpp	1970-01-01 00:00:00 +0000
39
+++ tools/unix-signal-handler.cpp	2015-07-01 10:55:15 +0000
40
@@ -0,0 +1,141 @@
41
1
/*
42
2
 * Copyright (C) 2015 Canonical, Ltd.
43
3
 *
44
4
 * This program is free software: you can redistribute it and/or modify it
45
5
 * under the terms of the GNU General Public License version 3, as published
46
6
 * by the Free Software Foundation.
47
7
 *
48
8
 * This program is distributed in the hope that it will be useful, but
49
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
50
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
51
11
 * PURPOSE.  See the GNU General Public License for more details.
52
12
 *
53
13
 * You should have received a copy of the GNU General Public License along
54
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
55
15
 *
56
16
 * Author: Marcus Tomlinson <marcus.tomlinson@canonical.com>
57
17
 */
58
18
59
19
#include "unix-signal-handler.h"
60
20
61
21
#include <QDebug>
62
22
63
23
#include <csignal>
64
24
#include <sys/socket.h>
65
25
#include <unistd.h>
66
26
67
27
int UnixSignalHandler::sighupFd[2];
68
28
int UnixSignalHandler::sigintFd[2];
69
29
int UnixSignalHandler::sigtermFd[2];
70
30
71
31
UnixSignalHandler::UnixSignalHandler(const std::function<void()>& f, QObject *parent)
72
32
    : QObject(parent),
73
33
      m_func(f)
74
34
{
75
35
    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd))
76
36
    {
77
37
        qFatal("Couldn't create HUP socketpair");
78
38
    }
79
39
    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigintFd))
80
40
    {
81
41
        qFatal("Couldn't create INT socketpair");
82
42
    }
83
43
    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd))
84
44
    {
85
45
        qFatal("Couldn't create TERM socketpair");
86
46
    }
87
47
88
48
    m_socketNotifierHup = new QSocketNotifier(sighupFd[1], QSocketNotifier::Read, this);
89
49
    connect(m_socketNotifierHup, &QSocketNotifier::activated, this, &UnixSignalHandler::handleSigHup);
90
50
    m_socketNotifierInt = new QSocketNotifier(sigintFd[1], QSocketNotifier::Read, this);
91
51
    connect(m_socketNotifierInt, &QSocketNotifier::activated, this, &UnixSignalHandler::handleSigInt);
92
52
    m_socketNotifierTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this);
93
53
    connect(m_socketNotifierTerm, &QSocketNotifier::activated, this, &UnixSignalHandler::handleSigTerm);
94
54
}
95
55
96
56
void UnixSignalHandler::hupSignalHandler(int)
97
57
{
98
58
    char a = 1;
99
59
    ::write(sighupFd[0], &a, sizeof(a));
100
60
}
101
61
102
62
void UnixSignalHandler::intSignalHandler(int)
103
63
{
104
64
    char a = 1;
105
65
    ::write(sigintFd[0], &a, sizeof(a));
106
66
}
107
67
108
68
void UnixSignalHandler::termSignalHandler(int)
109
69
{
110
70
    char a = 1;
111
71
    ::write(sigtermFd[0], &a, sizeof(a));
112
72
}
113
73
114
74
int UnixSignalHandler::setupUnixSignalHandlers()
115
75
{
116
76
    struct sigaction sighup, sigint, sigterm;
117
77
118
78
    sighup.sa_handler = UnixSignalHandler::hupSignalHandler;
119
79
    sigemptyset(&sighup.sa_mask);
120
80
    sighup.sa_flags = 0;
121
81
    sighup.sa_flags |= SA_RESTART;
122
82
123
83
    if (sigaction(SIGHUP, &sighup, 0) > 0)
124
84
    {
125
85
        return 1;
126
86
    }
127
87
128
88
    sigint.sa_handler = UnixSignalHandler::intSignalHandler;
129
89
    sigemptyset(&sigint.sa_mask);
130
90
    sigint.sa_flags = 0;
131
91
    sigint.sa_flags |= SA_RESTART;
132
92
133
93
    if (sigaction(SIGINT, &sigint, 0) > 0)
134
94
    {
135
95
        return 2;
136
96
    }
137
97
138
98
    sigterm.sa_handler = UnixSignalHandler::termSignalHandler;
139
99
    sigemptyset(&sigterm.sa_mask);
140
100
    sigterm.sa_flags |= SA_RESTART;
141
101
142
102
    if (sigaction(SIGTERM, &sigterm, 0) > 0)
143
103
    {
144
104
        return 3;
145
105
    }
146
106
147
107
    return 0;
148
108
}
149
109
150
110
void UnixSignalHandler::handleSigHup()
151
111
{
152
112
    m_socketNotifierHup->setEnabled(false);
153
113
    char tmp;
154
114
    ::read(sighupFd[1], &tmp, sizeof(tmp));
155
115
156
116
    m_func();
157
117
158
118
    m_socketNotifierHup->setEnabled(true);
159
119
}
160
120
161
121
void UnixSignalHandler::handleSigInt()
162
122
{
163
123
    m_socketNotifierInt->setEnabled(false);
164
124
    char tmp;
165
125
    ::read(sigintFd[1], &tmp, sizeof(tmp));
166
126
167
127
    m_func();
168
128
169
129
    m_socketNotifierInt->setEnabled(true);
170
130
}
171
131
172
132
void UnixSignalHandler::handleSigTerm()
173
133
{
174
134
    m_socketNotifierTerm->setEnabled(false);
175
135
    char tmp;
176
136
    ::read(sigtermFd[1], &tmp, sizeof(tmp));
177
137
178
138
    m_func();
179
139
180
140
    m_socketNotifierTerm->setEnabled(true);
181
141
}
182
0
142
183
=== added file 'tools/unix-signal-handler.h'
184
--- tools/unix-signal-handler.h	1970-01-01 00:00:00 +0000
185
+++ tools/unix-signal-handler.h	2015-07-01 10:55:15 +0000
186
@@ -0,0 +1,54 @@
187
1
/*
188
2
 * Copyright (C) 2015 Canonical, Ltd.
189
3
 *
190
4
 * This program is free software: you can redistribute it and/or modify it
191
5
 * under the terms of the GNU General Public License version 3, as published
192
6
 * by the Free Software Foundation.
193
7
 *
194
8
 * This program is distributed in the hope that it will be useful, but
195
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
196
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
197
11
 * PURPOSE.  See the GNU General Public License for more details.
198
12
 *
199
13
 * You should have received a copy of the GNU General Public License along
200
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
201
15
 *
202
16
 * Author: Marcus Tomlinson <marcus.tomlinson@canonical.com>
203
17
 */
204
18
205
19
#pragma once
206
20
207
21
#include <QObject>
208
22
#include <QSocketNotifier>
209
23
210
24
#include <functional>
211
25
212
26
class UnixSignalHandler: public QObject {
213
27
Q_OBJECT
214
28
215
29
public:
216
30
    UnixSignalHandler(const std::function<void()>& f, QObject *parent = 0);
217
31
    ~UnixSignalHandler() = default;
218
32
219
33
    static int setupUnixSignalHandlers();
220
34
221
35
protected Q_SLOTS:
222
36
    void handleSigHup();
223
37
    void handleSigInt();
224
38
    void handleSigTerm();
225
39
226
40
protected:
227
41
    static void hupSignalHandler(int unused);
228
42
    static void intSignalHandler(int unused);
229
43
    static void termSignalHandler(int unused);
230
44
231
45
    static int sighupFd[2];
232
46
    static int sigintFd[2];
233
47
    static int sigtermFd[2];
234
48
235
49
    std::function<void()> m_func;
236
50
237
51
    QSocketNotifier *m_socketNotifierHup;
238
52
    QSocketNotifier *m_socketNotifierInt;
239
53
    QSocketNotifier *m_socketNotifierTerm;
240
54
};
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-07-01	Approve on 2015-07-03
Michi Henning (community)			Approve on 2015-07-03
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-07-01
Review via email: mp+263497@code.launchpad.net