From 909a2f75c72fcbb44664af5534421d071fa0f702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Fri, 6 Jan 2017 16:51:48 +0100 Subject: [PATCH] Gracefully handling signals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: DuĊĦan Poizl --- mainwindow.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ mainwindow.h | 6 ++++++ 2 files changed, 46 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index 946c6da..cb3e2ae 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -11,6 +11,11 @@ #include #include #include +#include +#include +#include + +int MainWindow::socketPair[2] = {0, 0}; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), loading(false), @@ -50,6 +55,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_database = new Database(this); if(!m_database->init()) QMessageBox::critical(this, tr("Can't open DB"), tr("Can't open SQLITE database")); + + setupSigterm(); } MainWindow::~MainWindow() @@ -87,6 +94,39 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) event->ignore(); } +void MainWindow::setupSigterm() +{ + struct sigaction signal; + + signal.sa_handler = MainWindow::signalHandler; + sigemptyset(&signal.sa_mask); + signal.sa_flags = 0; + signal.sa_flags |= SA_RESTART; + + sigaction(SIGHUP, &signal, 0); + sigaction(SIGTERM, &signal, 0); + sigaction(SIGINT, &signal, 0); + + ::socketpair(AF_UNIX, SOCK_STREAM, 0, socketPair); + socketNotifier = new QSocketNotifier(socketPair[1], QSocketNotifier::Read, this); + connect(socketNotifier, SIGNAL(activated(int)), this, SLOT(socketNotify())); +} + +void MainWindow::signalHandler(int) +{ + char a = 1; + ::write(socketPair[0], &a, sizeof(a)); +} + +void MainWindow::socketNotify() +{ + socketNotifier->setEnabled(false); + char tmp; + read(socketPair[1], &tmp, sizeof(tmp)); + close(); + socketNotifier->setEnabled(true); +} + void MainWindow::pixmapLoaded(QPixmap pix) { m_image->setImage(pix); diff --git a/mainwindow.h b/mainwindow.h index e01cfda..abb79ce 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -2,6 +2,7 @@ #define MAINWINDOW_H #include +#include #include "imageringlist.h" #include "imagescrollarea.h" #include "database.h" @@ -14,13 +15,18 @@ class MainWindow : public QMainWindow Database *m_database; bool loading; int queued; + static int socketPair[2]; + QSocketNotifier *socketNotifier; public: MainWindow(QWidget *parent = 0); ~MainWindow(); protected: void keyPressEvent(QKeyEvent *event); void keyReleaseEvent(QKeyEvent *event); + void setupSigterm(); + static void signalHandler(int); protected slots: + void socketNotify(); void updateWindowTitle(); void pixmapLoaded(QPixmap pix); void openFile();