Merge lp:~gerboland/qtmir/emitSigstopAtCorrectTime into lp:qtmir

[Gerry Boland]

Emit SIGSTOP when AppMan fully initialized, when Mir is ready is too soon

Emit SIGSTOP when AppMan fully initialized, when Mir is ready is too soon

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Michał Sawicz (saviq)]

Will test in silo.

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:291
http://jenkins.qa.ubuntu.com/job/qtmir-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/30/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/179/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Everything seems fine, was unable to reproduce the issue.

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-10-30 11:55:15 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-12-12 12:22:20 +0000
@@ -167,6 +167,15 @@
     connectToSessionAuthorizer(appManager, sessionAuthorizer);
     connectToTaskController(appManager, taskController.data());
 
+    // Emit signal to notify Upstart that Mir is ready to receive client connections
+    // see http://upstart.ubuntu.com/cookbook/#expect-stop
+    // FIXME: should not be qtmir's job, instead should notify the user of this library
+    // that they should emit this signal, perhaps by posting an event to the
+    // QMirServerApplication event loop when it comes up
+    if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
+        raise(SIGSTOP);
+    }
+
     return appManager;
 }
 
 
=== modified file 'src/platforms/mirserver/mirserverstatuslistener.cpp'
--- src/platforms/mirserver/mirserverstatuslistener.cpp	2014-07-01 13:38:06 +0000
+++ src/platforms/mirserver/mirserverstatuslistener.cpp	2014-12-12 12:22:20 +0000
@@ -34,12 +34,4 @@
 
 void MirServerStatusListener::started()
 {
-    // Emit signal to notify Upstart that Mir is ready to receive client connections
-    // see http://upstart.ubuntu.com/cookbook/#expect-stop
-    // FIXME: should not be qtmir's job, instead should notify the user of this library
-    // that they should emit this signal, perhaps by posting an event to the
-    // QMirServerApplication event loop when it comes up
-    if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
-        raise(SIGSTOP);
-    }
 }