Merge lp:~gerboland/unity-mir/listen-for-server-start-stop-ready into lp:unity-mir

[Gerry Boland]

Install ServerStatusListener to be notified of mir server start, pause and resume.

Use start notification to send SIGSTOP signal to upstart, so it knows mir is ready for other clients

Install ServerStatusListener to be notified of mir server start, pause and resume.

Use start notification to send SIGSTOP signal to upstart, so it knows mir is ready for other clients

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

SIGSTOP seems like a weird choice. But if that's the requirement the code is OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/96/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3403/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-autolanding/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-autolanding/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-autolanding/18/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-19 19:11:22 +0000
+++ debian/changelog	2013-11-22 12:17:57 +0000
@@ -1,3 +1,12 @@
+unity-mir (0.2) UNRELEASED; urgency=low
+
+  * Install ServerStatusListener to be notified of mir server start, pause 
+    and resume. Use start notification to send SIGSTOP signal to upstart, 
+    so it knows mir is ready for other clients.
+  * Bump version number
+
+ -- Gerry Boland <[e-mail]>  Mon, 18 Nov 2013 11:49:48 +0000
+
 unity-mir (0.1+14.04.20131119-0ubuntu1) trusty; urgency=low
 
   [ Gerry Boland ]

=== added file 'src/unity-mir/serverstatuslistener.cpp'
--- src/unity-mir/serverstatuslistener.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-mir/serverstatuslistener.cpp	2013-11-22 12:17:57 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 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 version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ */
+
+// local
+#include "serverstatuslistener.h"
+
+// Qt
+#include <QtGlobal>
+#include <QByteArray>
+
+// std
+#include <csignal>
+
+void ServerStatusListener::paused()
+{
+}
+
+void ServerStatusListener::resumed()
+{
+}
+
+void ServerStatusListener::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 unity-mir'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("UPSTART_JOB") == "unity8") {
+        raise(SIGSTOP);
+    }
+}

=== added file 'src/unity-mir/serverstatuslistener.h'
--- src/unity-mir/serverstatuslistener.h	1970-01-01 00:00:00 +0000
+++ src/unity-mir/serverstatuslistener.h	2013-11-22 12:17:57 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 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 version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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 SERVERSTATUSLISTENER_H
+#define SERVERSTATUSLISTENER_H
+
+#include <mir/server_status_listener.h>
+
+class ServerStatusListener : public virtual mir::ServerStatusListener
+{
+public:
+    void paused() override;
+    void resumed() override;
+    void started() override;
+};
+
+#endif // SERVERSTATUSLISTENER_H

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2013-11-08 17:54:50 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2013-11-22 12:17:57 +0000
@@ -17,6 +17,7 @@
 #include "shellserverconfiguration.h"
 
 #include "initialsurfaceplacementstrategy.h"
+#include "serverstatuslistener.h"
 #include "sessionlistener.h"
 #include "surfaceconfigurator.h"
 #include "surfacefactory.h"
@@ -101,6 +102,16 @@
        });
 }
 
+std::shared_ptr<mir::ServerStatusListener>
+ShellServerConfiguration::the_server_status_listener()
+{
+    return server_status_listener(
+        []()
+        {
+            return std::make_shared<ServerStatusListener>();
+        });
+}
+
 /************************************ Shell side ************************************/
 
 //

=== modified file 'src/unity-mir/shellserverconfiguration.h'
--- src/unity-mir/shellserverconfiguration.h	2013-11-08 17:54:50 +0000
+++ src/unity-mir/shellserverconfiguration.h	2013-11-22 12:17:57 +0000
@@ -46,6 +46,7 @@
     std::shared_ptr<mir::shell::SurfaceConfigurator> the_shell_surface_configurator() override;
     std::shared_ptr<mir::shell::SurfaceFactory> the_shell_surface_factory() override;
     std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
+    std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
     std::shared_ptr<mir::frontend::SessionAuthorizer> the_session_authorizer() override;
 
     /* qt specific */

=== modified file 'src/unity-mir/unity-mir.pro'
--- src/unity-mir/unity-mir.pro	2013-11-08 17:54:50 +0000
+++ src/unity-mir/unity-mir.pro	2013-11-22 12:17:57 +0000
@@ -23,7 +23,8 @@
     shellserverconfiguration.cpp \
     surfacefactory.cpp \
     surfaceconfigurator.cpp \
-    focussetter.cpp
+    focussetter.cpp \
+    serverstatuslistener.cpp
 
 HEADERS += \
     dbusscreen.h \
@@ -36,7 +37,8 @@
     surfacefactory.h \
     surfaceconfigurator.h \
     logging.h \
-    focussetter.h
+    focussetter.h \
+    serverstatuslistener.h
 
 target.path = $$[QT_INSTALL_LIBS]