Merge into trunk : statesaver-signals : Code : Ubuntu UI Toolkit

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-03-26
Florian Boucault (community)		2014-02-06	Needs Fixing on 2014-02-11
Review via email: mp+205184@code.launchpad.net

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-06

942. By Zsombor Egri on 2014-02-06: prereq merge
943. By Zsombor Egri on 2014-02-06: prereq merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-06:

#

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1692/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2984/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2717/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/640/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/640/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2986/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2718/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1692/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-06:

#

FAILED: Continuous integration, rev:943
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1695/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2721/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/643/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/643/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2990/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2722/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1695/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-02-11:

#

1) modules/Ubuntu/Components/plugin/statesaverbackend_p.h has a dead/commented include
2) modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp has a qDebug() leftover

review: Needs Fixing

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-13

944. By Zsombor Egri on 2014-02-13: prerequisite merge
945. By Zsombor Egri on 2014-02-13: commented code removed

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-02-13:

#

> 1) modules/Ubuntu/Components/plugin/statesaverbackend_p.h has a dead/commented
> include
> 2) modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp has a qDebug()
> leftover

Done.

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-13

946. By Zsombor Egri on 2014-02-13: make read/write values unused to satisfy compilation

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-13:

#

FAILED: Continuous integration, rev:946
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1725/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2878/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/673/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/673/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2880/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1725/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-13

947. By Zsombor Egri on 2014-02-13: suppress read and write return value warning

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-13:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1730/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-24

948. By Zsombor Egri on 2014-02-24: prereq merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-24:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1762/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-25

949. By Zsombor Egri on 2014-02-25: prereq sync

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-25:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1785/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-02-26

950. By Zsombor Egri on 2014-02-26: kick2

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-26:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1793/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-10

951. By Zsombor Egri on 2014-03-10: prereq merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1854/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-10

952. By Zsombor Egri on 2014-03-10: more logs in runtest.sh

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1857/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-10

953. By Zsombor Egri on 2014-03-10: more logs

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

#

FAILED: Continuous integration, rev:953
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1860/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3782/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3370/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/808/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/808/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3800/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3372/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1860/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-11

954. By Zsombor Egri on 2014-03-11: missing include

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-11:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1874/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-14

955. By Zsombor Egri on 2014-03-14: remove SIGINT handling

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1883/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-14

956. By Zsombor Egri on 2014-03-14: remove SIGTERM, SIGINT on

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1884/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-14

957. By Zsombor Egri on 2014-03-14: signal hooks disabled

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1887/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1893/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-15:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1895/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-17

958. By Zsombor Egri on 2014-03-17: disabling signal tests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1897/rebuild

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-17

959. By Zsombor Egri on 2014-03-17: re-enable SIGTERM test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1898/rebuild

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-17

960. By Zsombor Egri on 2014-03-17: revert changes
961. By Zsombor Egri on 2014-03-17: SIGINT test removed
962. By Zsombor Egri on 2014-03-17: prereq merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1900/rebuild

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-24

963. By Zsombor Egri on 2014-03-24: put the SIGINT test back

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1930/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-24

964. By Zsombor Egri on 2014-03-24: use kill() to send SIGINT

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1932/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-25

965. By Zsombor Egri on 2014-03-25: prereq merge
966. By Zsombor Egri on 2014-03-25: fail if the PID to be killed is the same as the application's PID

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1946/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-26

967. By Zsombor Egri on 2014-03-26: different way to check pid

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1954/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-26

968. By Zsombor Egri on 2014-03-26: skip test if app PID is 0

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1957/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals updated on 2014-03-26

969. By Zsombor Egri on 2014-03-26: skip test if child pid is 0

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1959/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-03-27:

#

tested with latest proposed image

Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/statesaver-signals into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
 --- modules/Ubuntu/Components/plugin/plugin.pro	2014-03-05 12:29:58 +0000
 +++ modules/Ubuntu/Components/plugin/plugin.pro	2014-03-26 19:26:16 +0000
@@ -59,7 +59,8 @@
      ucstatesaver_p.h \
      ucurihandler.h \
      ucinversemouse.h \
--    ucmouse.h
++    ucmouse.h \
++    unixsignalhandler_p.h
  SOURCES += plugin.cpp \
      uctheme.cpp \
@@ -88,7 +89,8 @@
      ucstatesaver.cpp \
      statesaverbackend_p.cpp \
      ucurihandler.cpp \
--    ucmousefilters.cpp
++    ucmousefilters.cpp \
++    unixsignalhandler_p.cpp
  # adapters
  SOURCES += adapters/alarmsadapter_organizer.cpp
 === modified file 'modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp'
 --- modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp	2014-03-26 19:26:15 +0000
 +++ modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp	2014-03-26 19:26:16 +0000
@@ -29,6 +29,8 @@
  #include "quickutils.h"
  #include <QtCore/QStandardPaths>
++#include "unixsignalhandler_p.h"
++
  StateSaverBackend::StateSaverBackend(QObject *parent)
      : QObject(parent)
      , m_archive(0)
@@ -47,6 +49,11 @@
          QObject::connect(&UCApplication::instance(), &UCApplication::applicationNameChanged,
                           this, &StateSaverBackend::initialize);
+     }
++
++    UnixSignalHandler::instance().connectSignal(UnixSignalHandler::Terminate);
++    UnixSignalHandler::instance().connectSignal(UnixSignalHandler::Interrupt);
++    QObject::connect(&UnixSignalHandler::instance(), SIGNAL(signalTriggered(int)),
++                     this, SLOT(signalHandler(int)));
+ }
  StateSaverBackend::~StateSaverBackend()
@@ -74,6 +81,17 @@
      m_archive.clear();
+ }
++void StateSaverBackend::signalHandler(int type)
++{
++    if (type == UnixSignalHandler::Interrupt) {
++        Q_EMIT initiateStateSaving();
++        // disconnect aboutToQuit() so the state file doesn't get wiped upon quit
++        QObject::disconnect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
++                         this, &StateSaverBackend::cleanup);
++    }
++    QCoreApplication::quit();
++}
++
  bool StateSaverBackend::enabled() const
+ {
      return m_globalEnabled;
 === modified file 'modules/Ubuntu/Components/plugin/statesaverbackend_p.h'
 --- modules/Ubuntu/Components/plugin/statesaverbackend_p.h	2014-02-06 20:50:13 +0000
 +++ modules/Ubuntu/Components/plugin/statesaverbackend_p.h	2014-03-26 19:26:16 +0000
@@ -59,6 +59,7 @@
  private Q_SLOTS:
      void initialize();
      void cleanup();
++    void signalHandler(int type);
  private:
      QPointer<QSettings> m_archive;
 === added file 'modules/Ubuntu/Components/plugin/unixsignalhandler_p.cpp'
 --- modules/Ubuntu/Components/plugin/unixsignalhandler_p.cpp	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/plugin/unixsignalhandler_p.cpp	2014-03-26 19:26:16 +0000
@@ -0,0 +1,84 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#include "unixsignalhandler_p.h"
++#include <sys/socket.h>
++#include <signal.h>
++#include <unistd.h>
++#include <QtCore/QSocketNotifier>
++
++UnixSignalHandler::UnixSignalHandler(QObject *parent) :
++    QObject(parent)
++{
++}
++
++void UnixSignalHandler::connectSignal(SignalType type)
++{
++    if (notifiers.contains(type)) {
++        return;
++    }
++
++    HandlerType handler = createHandler((int)type);
++    notifiers.insert(type, handler);
++    socketRegister.insert(handler.first[1], type);
++}
++
++UnixSignalHandler::HandlerType UnixSignalHandler::createHandler(int signal)
++{
++    struct sigaction sigAction;
++    sigAction.sa_handler = signalHook;
++    ::sigemptyset(&sigAction.sa_mask);
++    sigAction.sa_flags = SA_RESTART;
++
++    if (::sigaction(signal, &sigAction, 0) > 0) {
++        qFatal("UNIX signal registration error");
++    }
++    HandlerType handler;
++    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, handler.first)) {
++        qFatal("Cannot create signal socketpair");
++    }
++    handler.second = new QSocketNotifier(handler.first[1], QSocketNotifier::Read, this);
++    QObject::connect(handler.second, SIGNAL(activated(int)), this, SLOT(notifierActivated(int)));
++
++    return handler;
++}
++
++void UnixSignalHandler::signalHook(int signal)
++{
++    HandlerType handler = UnixSignalHandler::instance().notifiers.value((SignalType)signal);
++    char value = 1;
++    ssize_t size = ::write(handler.first[0], &value, sizeof(value));
++    // this is needed to suppress write return value warning
++    Q_UNUSED(size)
++}
++
++void UnixSignalHandler::notifierActivated(int socket)
++{
++    // get the socket from the hash
++    SignalType signal = socketRegister.value(socket);
++    HandlerType handler = notifiers.value(signal);
++
++    handler.second->setEnabled(false);
++    char value;
++    ssize_t size = ::read(handler.first[1], &value, sizeof(value));
++    // this is needed to suppress read return value warning
++    Q_UNUSED(size)
++
++    Q_EMIT signalTriggered(signal);
++
++    handler.second->setEnabled(true);
++}
 === added file 'modules/Ubuntu/Components/plugin/unixsignalhandler_p.h'
 --- modules/Ubuntu/Components/plugin/unixsignalhandler_p.h	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/plugin/unixsignalhandler_p.h	2014-03-26 19:26:16 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++#ifndef UNIXSIGNALHANDLER_P_H
++#define UNIXSIGNALHANDLER_P_H
++
++#include <QtCore/QObject>
++#include <QtCore/QHash>
++#include <signal.h>
++
++class QSocketNotifier;
++class UnixSignalHandler : public QObject
++{
++    Q_OBJECT
++public:
++    enum SignalType {
++        Invalid = 0,
++        Interrupt = SIGINT,
++        Terminate = SIGTERM
++    };
++
++    typedef QPair<int[2], QSocketNotifier*> HandlerType;
++
++    static UnixSignalHandler &instance()
++    {
++        static UnixSignalHandler instance;
++        return instance;
++    }
++
++    void connectSignal(SignalType type);
++
++Q_SIGNALS:
++    void signalTriggered(int type);
++
++private Q_SLOTS:
++    void notifierActivated(int socket);
++private:
++    explicit UnixSignalHandler(QObject *parent = 0);
++
++    static void signalHook(int);
++    HandlerType createHandler(int signal);
++
++    QHash<SignalType, HandlerType> notifiers;
++    QHash<int, SignalType> socketRegister;
++};
++
++#endif // UNIXSIGNALHANDLER_P_H
 === added file 'tests/unit_x11/tst_statesaver/SimpleApp.qml'
 --- tests/unit_x11/tst_statesaver/SimpleApp.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_statesaver/SimpleApp.qml	2014-03-26 19:26:16 +0000
@@ -0,0 +1,28 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++Item {
++    property var boolArray: [false, false]
++    property var intArray: [1, 2]
++    property var realArray: [10.1, 20.2]
++    property var stringArray: ["false", "false"]
++    id: testItem
++    objectName: "testItem"
++    StateSaver.properties: "boolArray, intArray, realArray, stringArray"
++}
 === modified file 'tests/unit_x11/tst_statesaver/tst_statesaver.cpp'
 --- tests/unit_x11/tst_statesaver/tst_statesaver.cpp	2014-03-26 19:26:15 +0000
 +++ tests/unit_x11/tst_statesaver/tst_statesaver.cpp	2014-03-26 19:26:16 +0000
@@ -32,6 +32,7 @@
  #include "ucapplication.h"
  #include <QtCore/QProcess>
  #include <QtCore/QProcessEnvironment>
++#include <signal.h>
  #define protected public
  #include "ucstatesaver.h"
@@ -535,6 +536,52 @@
          QString fileName = stateFile("NormalAppClose");
          QVERIFY(!QFile(fileName).exists());
+     }
++
++    void test_SigTerm()
++    {
++        QProcess testApp;
++        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
++        env.insert("APP_ID", "SimpleApp");
++        testApp.setProcessEnvironment(env);
++        testApp.start("qmlscene -I ../../../modules SimpleApp.qml");
++        testApp.waitForStarted();
++
++        // send SIGTERM signal to the process, use terminate() to do that.
++        testApp.terminate();
++        testApp.waitForFinished();
++
++        QString fileName = stateFile("SimpleApp");
++        QVERIFY(!QFile(fileName).exists());
++    }
++
++    void test_SigInt()
++    {
++        QProcess testApp;
++        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
++        env.insert("APP_ID", "SimpleApp");
++        testApp.setProcessEnvironment(env);
++        testApp.start("qmlscene -I ../../../modules SimpleApp.qml");
++        testApp.waitForStarted();
++
++        QTest::qWait(1000);
++
++        // make sure we are not killing the parent
++        QVERIFY(testApp.pid() != QCoreApplication::applicationPid());
++        // skip tests if the application PID is zero => the child app PID seems to be zero as well
++        if (!testApp.pid()) {
++            // kill child process
++            testApp.close();
++            QSKIP("This test requires valid PID");
++        }
++        // send SIGINT
++        ::kill(testApp.pid(), SIGINT);
++        testApp.waitForFinished();
++
++        QString fileName = stateFile("SimpleApp");
++        QVERIFY(QFile(fileName).exists());
++        // clean the file
++        QFile::remove(fileName);
++    }
  };
  QTEST_MAIN(tst_StateSaverTest)