Merge lp:~aacid/unity8/handle_termination_signals into lp:unity8

[Albert Astals Cid]

Make unity8 and unity8-dash handle termination signals

This way the app gracefully exists, making things like "flush qml debugging when app finishes" work

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Gerry Boland (gerboland)]

Nitpick:
+ UnixSignalHandler signal_handler([]{
we prefer camelCase, no?

Rest looks fine

review: Needs Fixing

[lp:~aacid/unity8/handle_termination_signals]

2377. By Albert Astals Cid on 2016-05-04

I'm a cAmeL

[Albert Astals Cid (aacid)]

> Nitpick:
> + UnixSignalHandler signal_handler([]{
> we prefer camelCase, no?

Changed

[Gerry Boland (gerboland)]

LGTM

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2376
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1120/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/676
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/676
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/676
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1504
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1468
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1468
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1468
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1468
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1468
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1468
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1468
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1468/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1468
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1468/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1120/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

What about CamelCase in the filename as well? as nearly all files in src follow that convention?

review: Needs Information

[Albert Astals Cid (aacid)]

I'm just moving it, i'd prefer not to rename it too, but can do if you really want it.

[Daniel d'Andrada (dandrader)]

On 05/05/2016 12:24, Albert Astals Cid wrote:
> I'm just moving it, i'd prefer not to rename it too, but can do if you really want it.
move and rename are pretty much the same thing (in bzr you do both with
"bzr mv"). bzr history will follow just fine.

[Albert Astals Cid (aacid)]

> move and rename are pretty much the same thing (in bzr you do both with
> "bzr mv"). bzr history will follow just fine.

I know, are you asking me to rename it?

[Daniel d'Andrada (dandrader)]

On 09/05/2016 07:13, Albert Astals Cid wrote:
>> move and rename are pretty much the same thing (in bzr you do both with
>> "bzr mv"). bzr history will follow just fine.
> I know, are you asking me to rename it?
Yes

[lp:~aacid/unity8/handle_termination_signals]

2378. By Albert Astals Cid on 2016-05-09

Critical rename bugfix

2379. By Albert Astals Cid on 2016-05-09

Merge

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2376
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1164/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/714
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/714
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/714/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1557
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1517
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1517
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1517/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1517
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1517/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1164/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2376
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1208/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/749
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/749
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1622
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1577
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1577
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1570/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1208/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/handle_termination_signals]

2380. By Albert Astals Cid on 2016-05-19

Merge

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2380
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1254/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/790
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/790
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1690
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1640
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1640
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1633
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1633
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1633
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1633
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1633
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1633
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1633/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1254/rebuild

review: Approve (continuous-integration)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-17 15:54:34 +0000
+++ src/CMakeLists.txt	2016-05-19 07:31:43 +0000
@@ -24,6 +24,7 @@
     ShellApplication.cpp
     ShellView.cpp
     UnityCommandLineParser.cpp
+    UnixSignalHandler.cpp
     ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
 )
 

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2016-02-17 15:54:34 +0000
+++ src/Dash/CMakeLists.txt	2016-05-19 07:31:43 +0000
@@ -1,6 +1,7 @@
 set(DASH_SRCS
     main.cpp
     ../CachingNetworkManagerFactory.cpp
+    ../UnixSignalHandler.cpp
 )
 
 if (ENABLE_TOUCH_EMULATION)

=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2016-04-08 09:31:05 +0000
+++ src/Dash/main.cpp	2016-05-19 07:31:43 +0000
@@ -32,6 +32,7 @@
     #include "../MouseTouchAdaptor.h"
 #endif
 #include "../CachingNetworkManagerFactory.h"
+#include "../UnixSignalHandler.h"
 
 int main(int argc, const char *argv[])
 {
@@ -116,6 +117,11 @@
     view->setSource(source);
     view->show();
 
+    UnixSignalHandler signalHandler([]{
+        QGuiApplication::exit(0);
+    });
+    signalHandler.setupUnixSignalHandlers();
+
     int result = application->exec();
 
     delete view;

=== renamed file 'tools/unix-signal-handler.cpp' => 'src/UnixSignalHandler.cpp'
--- tools/unix-signal-handler.cpp	2015-07-01 10:48:40 +0000
+++ src/UnixSignalHandler.cpp	2016-05-19 07:31:43 +0000
@@ -16,7 +16,7 @@
  * Author: Marcus Tomlinson <[e-mail]>
  */
 
-#include "unix-signal-handler.h"
+#include "UnixSignalHandler.h"
 
 #include <QDebug>
 

=== renamed file 'tools/unix-signal-handler.h' => 'src/UnixSignalHandler.h'
=== modified file 'src/main.cpp'
--- src/main.cpp	2016-04-08 09:31:05 +0000
+++ src/main.cpp	2016-05-19 07:31:43 +0000
@@ -17,6 +17,7 @@
 // local
 #include "ShellApplication.h"
 #include "qmldebuggerutils.h"
+#include "UnixSignalHandler.h"
 
 int main(int argc, const char *argv[])
 {
@@ -32,6 +33,11 @@
 
     ShellApplication *application = new ShellApplication(argc, (char**)argv, isMirServer);
 
+    UnixSignalHandler signalHandler([]{
+        QGuiApplication::exit(0);
+    });
+    signalHandler.setupUnixSignalHandlers();
+
     int result = application->exec();
 
     application->destroyResources();

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2015-07-01 10:48:40 +0000
+++ tools/CMakeLists.txt	2016-05-19 07:31:43 +0000
@@ -1,7 +1,7 @@
 add_executable(${SCOPE_TOOL}
     scopetool.cpp
     registry-tracker.cpp
-    unix-signal-handler.cpp
+    ../src/UnixSignalHandler.cpp
     )
 
 qt5_use_modules(${SCOPE_TOOL} Qml Quick)

=== modified file 'tools/scopetool.cpp'
--- tools/scopetool.cpp	2015-09-22 10:44:21 +0000
+++ tools/scopetool.cpp	2016-05-19 07:31:43 +0000
@@ -32,7 +32,7 @@
 // local
 #include <paths.h>
 #include "registry-tracker.h"
-#include "unix-signal-handler.h"
+#include "../src/UnixSignalHandler.h"
 
 
 int main(int argc, char *argv[])