Merge lp:~mzanetti/unity-mir/quit-manually-started-procs into lp:unity-mir

[Michael Zanetti]

send a SIGTERM to the process if upstart fails to stop an application

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

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?

no

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

no

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/171
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/170

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/307/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Why is the bug marked invalid?

Please add the MR checklist.

Fix looks good & tests fine.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Why is the bug marked invalid?

Seems only invalid for the settings app.

>
> Please add the MR checklist.

done

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-04-01 22:49:46 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-04-03 12:55:31 +0000
@@ -45,6 +45,9 @@
 // Qt
 #include <QCoreApplication>
 
+// std
+#include <csignal>
+
 // Default element sizes
 #define SIDE_STAGE_WIDTH_GU 40
 #define TABLET_MODE_MINIMUM_WIDTH_GU 100
@@ -505,6 +508,12 @@
     bool result = m_taskController->stop(application->appId());
 
     LOG_IF(result == false, "FAILED to ask Upstart to stop application '%s'", qPrintable(application->appId()));
+
+    if (!result && application->pid() > 0) {
+        DLOG("TaskController::stop UAL failed. Sending SIGTERM to %i", application->pid());
+        kill(application->pid(), SIGTERM);
+    }
+
     delete application;
 
     // FIXME(dandrader): lying here. The operation is async. So we will only know whether