Skip to content

Commit

Permalink
Merge pull request #6945 from spycrab/qt_sighandler
Browse files Browse the repository at this point in the history
Qt/Unix: Implement signal handler
  • Loading branch information
spycrab committed May 28, 2018
2 parents b2d8d2a + 112a174 commit 75e87a8
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 1 deletion.
1 change: 1 addition & 0 deletions Source/Core/DolphinQt2/CMakeLists.txt
Expand Up @@ -96,6 +96,7 @@ add_executable(dolphin-emu
QtUtils/DoubleClickEventFilter.cpp QtUtils/DoubleClickEventFilter.cpp
QtUtils/ElidedButton.cpp QtUtils/ElidedButton.cpp
QtUtils/ImageConverter.cpp QtUtils/ImageConverter.cpp
QtUtils/SignalDaemon.cpp
QtUtils/WindowActivationEventFilter.cpp QtUtils/WindowActivationEventFilter.cpp
QtUtils/WinIconHelper.cpp QtUtils/WinIconHelper.cpp
QtUtils/WrapInScrollArea.cpp QtUtils/WrapInScrollArea.cpp
Expand Down
32 changes: 31 additions & 1 deletion Source/Core/DolphinQt2/MainWindow.cpp
@@ -1,4 +1,3 @@

// Copyright 2015 Dolphin Emulator Project // Copyright 2015 Dolphin Emulator Project
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
Expand All @@ -20,6 +19,12 @@
#include <future> #include <future>
#include <optional> #include <optional>


#if defined(__unix__) || defined(__unix) || defined(__APPLE__)
#include <signal.h>

#include "QtUtils/SignalDaemon.h"
#endif

#include "Common/Version.h" #include "Common/Version.h"


#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
Expand Down Expand Up @@ -86,6 +91,23 @@
#include "UICommon/X11Utils.h" #include "UICommon/X11Utils.h"
#endif #endif


#if defined(__unix__) || defined(__unix) || defined(__APPLE__)
void MainWindow::OnSignal()
{
close();
}

static void InstallSignalHandler()
{
struct sigaction sa;
sa.sa_handler = &SignalDaemon::HandleInterrupt;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESETHAND;
sigaction(SIGINT, &sa, nullptr);
sigaction(SIGTERM, &sa, nullptr);
}
#endif

MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainWindow(nullptr) MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainWindow(nullptr)
{ {
setWindowTitle(QString::fromStdString(Common::scm_rev_str)); setWindowTitle(QString::fromStdString(Common::scm_rev_str));
Expand All @@ -109,6 +131,14 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainW


NetPlayInit(); NetPlayInit();


#if defined(__unix__) || defined(__unix) || defined(__APPLE__)
auto* daemon = new SignalDaemon(this);

connect(daemon, &SignalDaemon::InterruptReceived, this, &MainWindow::OnSignal);

InstallSignalHandler();
#endif

if (boot_parameters) if (boot_parameters)
m_pending_boot = std::move(boot_parameters); m_pending_boot = std::move(boot_parameters);


Expand Down
1 change: 1 addition & 0 deletions Source/Core/DolphinQt2/MainWindow.h
Expand Up @@ -138,6 +138,7 @@ class MainWindow final : public QMainWindow
void OnBootGameCubeIPL(DiscIO::Region region); void OnBootGameCubeIPL(DiscIO::Region region);
void OnImportNANDBackup(); void OnImportNANDBackup();
void OnConnectWiiRemote(int id); void OnConnectWiiRemote(int id);
void OnSignal();


void OnUpdateProgressDialog(QString label, int progress, int total); void OnUpdateProgressDialog(QString label, int progress, int total);


Expand Down
55 changes: 55 additions & 0 deletions Source/Core/DolphinQt2/QtUtils/SignalDaemon.cpp
@@ -0,0 +1,55 @@
// Copyright 2018 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "DolphinQt2/QtUtils/SignalDaemon.h"

#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>

#include <QSocketNotifier>

int SignalDaemon::s_sigterm_fd[2];

static constexpr char message[] =
"\nA signal was received. A second signal will force Dolphin to stop.\n";

SignalDaemon::SignalDaemon(QObject* parent) : QObject(parent)
{
if (socketpair(AF_UNIX, SOCK_STREAM, 0, s_sigterm_fd))
qFatal("Couldn't create TERM socketpair");

m_term = new QSocketNotifier(s_sigterm_fd[1], QSocketNotifier::Read, this);
connect(m_term, &QSocketNotifier::activated, this, &SignalDaemon::OnNotifierActivated);
}

SignalDaemon::~SignalDaemon()
{
close(s_sigterm_fd[0]);
close(s_sigterm_fd[1]);
}

void SignalDaemon::OnNotifierActivated()
{
m_term->setEnabled(false);

char tmp;
if (read(s_sigterm_fd[1], &tmp, sizeof(char)))
{
}

m_term->setEnabled(true);

emit InterruptReceived();
}

void SignalDaemon::HandleInterrupt(int)
{
write(STDERR_FILENO, message, sizeof(message));

char a = 1;
if (write(s_sigterm_fd[0], &a, sizeof(a)))
{
}
}
31 changes: 31 additions & 0 deletions Source/Core/DolphinQt2/QtUtils/SignalDaemon.h
@@ -0,0 +1,31 @@
// Copyright 2018 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.

#pragma once

#include <QObject>

class QSocketNotifier;

// Loosely based on https://doc.qt.io/qt-5.9/unix-signals.html
class SignalDaemon : public QObject
{
Q_OBJECT

public:
explicit SignalDaemon(QObject* parent);
~SignalDaemon();

static void HandleInterrupt(int);

signals:
void InterruptReceived();

private:
void OnNotifierActivated();

static int s_sigterm_fd[2];

QSocketNotifier* m_term;
};

0 comments on commit 75e87a8

Please sign in to comment.