Merge lp:~mterry/unity8/systemd into lp:unity8

[Michael Terry]

WIP

[lp:~mterry/unity8/systemd]

2894. By Michael Terry on 2017-04-03

Fix up some packaging bits

2895. By Michael Terry on 2017-04-03

Add missing service file

Unmerged revisions

2895. By Michael Terry on 2017-04-03

Add missing service file

2894. By Michael Terry on 2017-04-03

Fix up some packaging bits

2893. By Michael Terry on 2017-03-30

Fix trapping of STOP

2892. By Michael Terry on 2017-03-29

First (unfinished) pass at systemd unit for unity8

=== removed file 'data/unity8-dash.conf'
--- data/unity8-dash.conf	2016-10-07 17:22:21 +0000
+++ data/unity8-dash.conf	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-description "Unity Shell v8 Dash"
-author "Michael Zanetti <[e-mail]>"
-
-emits scope-ui-starting
-
-start on started unity8
-stop on stopping unity8
-
-kill timeout 120
-
-# Focused app is 100 so we want to be less likely to get
-# killed than the focused app but more than Unity8
-
-oom score 50
-
-respawn
-respawn limit unlimited
-
-env APP_ID=unity8-dash
-
-pre-start script
-    initctl emit scope-ui-starting
-end script
-
-exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=unity8-dash.desktop
 
=== added file 'data/unity8-dash.service'
--- data/unity8-dash.service	1970-01-01 00:00:00 +0000
+++ data/unity8-dash.service	2017-04-03 17:54:55 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=Unity Shell v8 Dash
+PartOf=graphical-session.target
+BindsTo=unity8.service
+After=unity8.service
+
+[Service]
+ExecStart=/usr/bin/unity8-dash --desktop_file_hint=unity8-dash
+Restart=always
+TimeoutStartSec=120
+Environment=APP_ID=unity8-dash
+
+# Focused app is 100 so we want to be less likely to get
+# killed than the focused app but more than Unity8
+OOMScoreAdjust=50
 
=== removed file 'data/unity8-filewatcher.conf'
--- data/unity8-filewatcher.conf	2016-10-07 17:22:21 +0000
+++ data/unity8-filewatcher.conf	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-description "File system watcher for unity8"
-author "Michael Zanetti <[e-mail]>"
-
-# This method of updating the launcher will not work in our new snappy world,
-# neither for snaps installed in the system nor if we are running inside a snap.
-# Plus it hardcodes the phablet user...  To be replaced once bug 1630997 is
-# fixed in ubuntu-app-launch.
-
-# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
-start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
-
-exec dbus-send --type=method_call --dest=com.canonical.Unity.Launcher /com/canonical/Unity/Launcher com.canonical.Unity.Launcher.Refresh
-
 
=== added file 'data/unity8-session'
--- data/unity8-session	1970-01-01 00:00:00 +0000
+++ data/unity8-session	2017-04-03 17:54:55 +0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 2 -*-
+
+# Ensure the shell always gets unthrottled touch events, so that applications
+# who want full speed low-latency input can get it (LP: #1497105) and so that
+# apps can use QML touch compression safely (the QML touch compression
+# algorithm does not support nesting well - LP: #1486341, LP: #1556763 - so
+# must be fed by the raw input event stream from Unity8).
+export QML_NO_TOUCH_COMPRESSION=1
+
+export MIR_SERVER_PROMPT_FILE=1
+
+# Hard code socket path because our snappy apparmor profile
+# only lets us put the socket in one place.  And consumers expect it there.
+# (XDG_RUNTIME_DIR isn't typical under snappy)
+export MIR_SERVER_FILE=/run/user/$(id -u)/mir_socket
+
+rm -f "$MIR_SERVER_FILE"
+rm -f "${MIR_SERVER_FILE}_trusted"
+
+if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then
+  # On Ubuntu Touch, we currently use a trick where we auto-login the
+  # user without a LightDM greeter at all.  In this case, we want to
+  # start with the lockscreen visible.  Once we switch to using a
+  # proper greeter for the first login, we can remove this code path.
+  MODE=full-greeter
+else
+  MODE=full-shell
+fi
+
+dbus-update-activation-environment --systemd MIR_SOCKET=$MIR_SERVER_FILE
+
+# Tell unity-mir to raise SIGSTOP after we start, which we use to tell
+# systemd when we are done starting up.
+export UNITY_MIR_EMITS_SIGSTOP=1
+
+${BINARY:-unity8} --mode=$MODE "$@" &
+child=$!
+
+# Wait for SIGSTOP in child
+while [ $(ps --no-headers -o state $child) != "T" ]; do
+  sleep 0.1
+done
+
+kill -CONT $child
+exit 0
 
=== removed file 'data/unity8.conf'
--- data/unity8.conf	2017-02-08 15:46:18 +0000
+++ data/unity8.conf	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-description "Unity Shell v8"
-author "Ricardo Mendoza <[e-mail]>"
-
-emits indicator-services-start
-
-start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus
-stop on desktop-end
-
-kill timeout 120
-
-#
-# Ensure the shell always gets unthrottled touch events, so that applications
-# who want full speed low-latency input can get it (LP: #1497105) and so that
-# apps can use QML touch compression safely (the QML touch compression
-# algorithm does not support nesting well - LP: #1486341, LP: #1556763 - so
-# must be fed by the raw input event stream from Unity8).
-#
-env QML_NO_TOUCH_COMPRESSION=1
-
-respawn
-expect stop
-
-# FIXME Create an autopilot test that makes sure start+stop and restart
-#       work fine at least 2 times
-
-pre-start script
-    # Tell unity-mir to raise SIGSTOP after we start
-    initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
-
-    # Save original value of MIR_SOCKET so that we can restore it when stopped,
-    # as we modify the variable for future jobs, including ourself.
-    initctl set-env UNITY_MIR_SOCKET=$MIR_SOCKET
-
-    # Decide where we are going to put our own socket file
-    if [ -n "$SNAP" ]; then
-        # In snappy, we want to hard code our path because our apparmor profile
-        # only lets us put the socket in one place.  And consumers expect it
-        # there.
-        MIR_SERVER_FILE=/run/user/$(id -u)/mir_socket
-    else
-        MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
-    fi
-    initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
-
-    # Point all future jobs in this session to our Mir socket instead of
-    # unity-system-compositor's socket.
-    initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
-    gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
-
-    # Remove the normal and trusted sockets if still there
-    if [ -S "$MIR_SERVER_FILE" ]; then
-        rm "$MIR_SERVER_FILE"
-    fi
-
-    if [ -S "${MIR_SERVER_FILE}_trusted" ]; then
-        rm "${MIR_SERVER_FILE}_trusted"
-    fi
-
-    initctl set-env --global MIR_SERVER_PROMPT_FILE=1
-
-    if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then
-        # On Ubuntu Touch, we currently use a trick where we auto-login the
-        # user without a LightDM greeter at all.  In this case, we want to
-        # start with the lockscreen visible.  Once we switch to using a
-        # proper greeter for the first login, we can remove this code path.
-        initctl set-env MODE=full-greeter
-    else
-        initctl set-env MODE=full-shell
-    fi
-end script
-
-exec ${BINARY:-unity8} --mode=$MODE $ARGS
-
-post-start script
-    initctl emit --no-wait indicator-services-start
-end script
-
-post-stop script
-    initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
-    initctl unset-env --global MIR_SERVER_PROMPT_FILE
-    initctl emit application-end
-end script
 
=== added file 'data/unity8.service'
--- data/unity8.service	1970-01-01 00:00:00 +0000
+++ data/unity8.service	2017-04-03 17:54:55 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=Unity Shell v8
+PartOf=graphical-session.target
+Requires=dbus.socket
+After=dbus.socket
+Before=indicators.target
+Wants=unity8-dash.service
+Wants=indicators.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/unity8-session
+ExecStopPost=/usr/bin/dbus-update-activation-environment --systemd MIR_SOCKET=
+Restart=on-failure
+TimeoutStartSec=120
 
=== modified file 'debian/control'
--- debian/control	2017-03-20 10:19:11 +0000
+++ debian/control	2017-04-03 17:54:55 +0000
@@ -6,6 +6,7 @@
                dbus-test-runner,
                debhelper (>= 9),
                dh-apparmor,
+               dh-systemd,
                doxyqml,
 # To allow cross-compiling to work, we also must append :native
 # to g++ so we don't try to run arm g++
@@ -71,6 +72,7 @@
                qtdeclarative5-private-dev (>= 5.6),
                qtdeclarative5-ubuntu-content1,
                qtdeclarative5-ubuntu-settings-components (>= 0.11),
+               systemd,
                ttf-ubuntu-font-family,
                xvfb,
 Standards-Version: 3.9.4
@@ -120,7 +122,8 @@
 Package: unity8
 Architecture: any
 Provides: indicator-renderer,
-Depends: dmz-cursor-theme,
+Depends: dbus,
+         dmz-cursor-theme,
          gsettings-desktop-schemas,
          libcap2-bin,
          libglib2.0-bin,
 
=== modified file 'debian/rules'
--- debian/rules	2017-01-18 00:25:13 +0000
+++ debian/rules	2017-04-03 17:54:55 +0000
@@ -9,7 +9,7 @@
 export NO_PNG_PKG_MANGLE=1
 
 %:
-	dh $@ --parallel --fail-missing --with python3
+	dh $@ --parallel --fail-missing --with python3,systemd
 
 override_dh_auto_configure:
 	# Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.
 
=== modified file 'debian/unity8.install'
--- debian/unity8.install	2016-10-04 16:21:38 +0000
+++ debian/unity8.install	2017-04-03 17:54:55 +0000
@@ -1,8 +1,8 @@
 debian/usr.bin.unity8-dash etc/apparmor.d
 var/lib/unity8/version
-data/unity8-dash.conf usr/share/upstart/sessions/
-data/unity8-filewatcher.conf usr/share/upstart/sessions/
-data/unity8.conf usr/share/upstart/sessions/
+data/unity8.service usr/lib/systemd/user
+data/unity8-dash.service usr/lib/systemd/user
+data/unity8-session usr/bin
 data/devices.conf etc/ubuntu/
 usr/bin/unity8
 usr/bin/unity8-dash
 
=== modified file 'plugins/Unity/Launcher/dbusinterface.cpp'
--- plugins/Unity/Launcher/dbusinterface.cpp	2015-11-20 15:01:39 +0000
+++ plugins/Unity/Launcher/dbusinterface.cpp	2017-04-03 17:54:55 +0000
@@ -39,6 +39,8 @@
         QString nodes;
 
         // Add Refresh to introspect
+        // TODO: Confirm this is still used anywhere and remove if not.
+        //       It used to be used in an upstart job when desktop fles changed.
         nodes = QStringLiteral("<interface name=\"com.canonical.Unity.Launcher\">"
                 "<method name=\"Refresh\"/>"
                 "</interface>");
 
=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2017-03-21 10:51:38 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2017-04-03 17:54:55 +0000
@@ -36,6 +36,7 @@
 
 #define LOGIN1_SERVICE QStringLiteral("org.freedesktop.login1")
 #define LOGIN1_PATH QStringLiteral("/org/freedesktop/login1")
+#define LOGIN1_SESSION_ROOT QStringLiteral("/org/freedesktop/login1/session/")
 #define LOGIN1_IFACE QStringLiteral("org.freedesktop.login1.Manager")
 #define LOGIN1_SESSION_IFACE QStringLiteral("org.freedesktop.login1.Session")
 
@@ -58,16 +59,9 @@
 
     void init()
     {
-        // get our logind session path
-        QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
-                                                          LOGIN1_PATH,
-                                                          LOGIN1_IFACE,
-                                                          QStringLiteral("GetSessionByPID"));
-        msg << (quint32) getpid();
-
-        QDBusReply<QDBusObjectPath> reply = QDBusConnection::SM_BUSNAME().call(msg);
-        if (reply.isValid()) {
-            logindSessionPath = reply.value().path();
+        QString sessionID = QString::fromLocal8Bit(qgetenv("XDG_SESSION_ID"));
+        if (!sessionID.isEmpty()) {
+            logindSessionPath = LOGIN1_SESSION_ROOT + sessionID;
 
             // start watching the Active property
             QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, logindSessionPath, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"),
@@ -79,7 +73,7 @@
             QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("PrepareForSleep"),
                                                   this, SLOT(onResuming(bool)));
         } else {
-            qWarning() << "Failed to get logind session path" << reply.error().message();
+            qWarning() << "Failed to get logind session: XDG_SESSION_ID is not set";
         }
     }
 
 
=== modified file 'tests/plugins/Unity/Session/CMakeLists.txt'
--- tests/plugins/Unity/Session/CMakeLists.txt	2017-03-14 18:51:23 +0000
+++ tests/plugins/Unity/Session/CMakeLists.txt	2017-04-03 17:54:55 +0000
@@ -60,6 +60,7 @@
 
 add_unity8_unittest(SessionBackend dbus-test-runner
     ENVIRONMENT LD_PRELOAD=$<TARGET_FILE:SessionBackendTestPreload>
+                XDG_SESSION_ID=testing
                 XDG_SESSION_PATH=/session
     ARG_PREFIX "--parameter"
     ARGS
 
=== modified file 'tests/plugins/Unity/Session/LogindServer.cpp'
--- tests/plugins/Unity/Session/LogindServer.cpp	2017-03-15 21:31:32 +0000
+++ tests/plugins/Unity/Session/LogindServer.cpp	2017-04-03 17:54:55 +0000
@@ -22,11 +22,6 @@
 {
 }
 
-QDBusObjectPath LogindServer::GetSessionByPID(quint32)
-{
-    return QDBusObjectPath("/logindsession");
-}
-
 void LogindServer::Reboot(bool interactive)
 {
     Q_EMIT RebootCalled(interactive);
 
=== modified file 'tests/plugins/Unity/Session/LogindServer.h'
--- tests/plugins/Unity/Session/LogindServer.h	2017-03-15 21:31:32 +0000
+++ tests/plugins/Unity/Session/LogindServer.h	2017-04-03 17:54:55 +0000
@@ -30,7 +30,6 @@
     explicit LogindServer(QObject *parent = nullptr);
 
 public Q_SLOTS:
-    QDBusObjectPath GetSessionByPID(quint32 pid);
     void Reboot(bool interactive);
     void PowerOff(bool interactive);
 
 
=== modified file 'tests/plugins/Unity/Session/interfaces.xml'
--- tests/plugins/Unity/Session/interfaces.xml	2017-03-15 21:31:32 +0000
+++ tests/plugins/Unity/Session/interfaces.xml	2017-04-03 17:54:55 +0000
@@ -3,10 +3,6 @@
     <method name="Lock" />
   </interface>
   <interface name="org.freedesktop.login1.Manager">
-    <method name="GetSessionByPID">
-      <arg name="pid" type="u" direction="in" />
-      <arg name="session" type="o" direction="out" />
-    </method>
     <method name="Reboot">
       <arg name="interactive" type="b" direction="in" />
     </method>
 
=== modified file 'tests/plugins/Unity/Session/server.cpp'
--- tests/plugins/Unity/Session/server.cpp	2016-06-21 14:23:49 +0000
+++ tests/plugins/Unity/Session/server.cpp	2017-04-03 17:54:55 +0000
@@ -37,7 +37,7 @@
     auto connection = QDBusConnection::sessionBus();
     if (!connection.registerObject("/org/freedesktop/login1", logind))
         return 1;
-    if (!connection.registerObject("/logindsession", logind))
+    if (!connection.registerObject("/org/freedesktop/login1/session/testing", logind))
         return 1;
     if (!connection.registerService("org.freedesktop.login1"))
         return 1;
 
=== modified file 'tests/plugins/Unity/Session/sessionbackendtest.cpp'
--- tests/plugins/Unity/Session/sessionbackendtest.cpp	2017-03-21 10:51:38 +0000
+++ tests/plugins/Unity/Session/sessionbackendtest.cpp	2017-04-03 17:54:55 +0000
@@ -103,8 +103,8 @@
         QCoreApplication::processEvents(); // to let the services register on DBus
 
         QDBusInterface login1Interface("org.freedesktop.login1",
-                                      "/logindsession",
-                                      "org.freedesktop.login1.Manager");
+                                       "/org/freedesktop/login1/session/testing",
+                                       "org.freedesktop.login1.Manager");
         QSignalSpy spy(&login1Interface, signal.toUtf8().data());
 
         QDBusInterface dbusGnomeSessionWrapper("org.gnome.SessionManager",
@@ -225,7 +225,9 @@
         DBusUnitySessionService dbusUnitySessionService;
         QCoreApplication::processEvents(); // to let the service register on DBus
 
-        QDBusInterface iface("org.freedesktop.login1", "/logindsession", "org.freedesktop.login1.Session");
+        QDBusInterface iface("org.freedesktop.login1",
+                             "/org/freedesktop/login1/session/testing",
+                             "org.freedesktop.login1.Session");
         QVERIFY(iface.isValid());
 
         QSignalSpy spy(&dbusUnitySessionService, SIGNAL(Unlocked()));