Merge lp:~ogra/session-manager/posix-rewrite into lp:session-manager

[Oliver Grawert]

posix rewrite and configuration management changes

- complete rewrite of ubuntu-session to comply with Ubuntus usually used POSIX standard
- switch to cyanogenmod device naming
- add support for /etc/ubuntu-session.d/$device.conf configurations to make it easier to add new devices
- make sure processes are killled in reverse order in which they were started
- keep the last ubuntu-session log around for better debugging

[Oliver Grawert (ogra)]

that code was tested on my GT-I9100

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/session-manager-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-ci/./build=pbuilder,distribution=quantal,flavor=armhf/41/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-ci/./build=pbuilder,distribution=quantal,flavor=i386/41/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/session-manager-ci/41/rebuild

review: Approve (continuous-integration)

[Loïc Minier (lool)]

On Fri, Mar 15, 2013, Oliver Grawert wrote:
> --- ubuntu-session.d/dlx.conf 1970-01-01 00:00:00 +0000
> +++ ubuntu-session.d/dlx.conf 2013-03-15 12:47:33 +0000
> +services="/etc/phone-services"
> +FORM_FACTOR="phone"
>
> --- ubuntu-session.d/grouper.conf 1970-01-01 00:00:00 +0000
> +++ ubuntu-session.d/grouper.conf 2013-03-15 12:47:33 +0000
> +services="/etc/tablet-services"
> +FORM_FACTOR="tablet"
>
> --- ubuntu-session.d/i9100.conf 1970-01-01 00:00:00 +0000
> +++ ubuntu-session.d/i9100.conf 2013-03-15 12:47:33 +0000
> +services="/etc/phone-services"
> +FORM_FACTOR="phone"
>
> --- ubuntu-session.d/manta.conf 1970-01-01 00:00:00 +0000
> +++ ubuntu-session.d/manta.conf 2013-03-15 12:47:33 +0000
> +services="/etc/tablet-services"
> +FORM_FACTOR="tablet"

Seems services= doesn't need to be set each time; just using
/etc/$FORM_FACTOR-services should work?

--
Loïc Minier

[lp:~ogra/session-manager/posix-rewrite]

46. By Oliver Grawert on 2013-03-15

instead of using the services variable, rather re-use the FORM_FACTOR

[Oliver Grawert (ogra)]

thanks, changed ...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/session-manager-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-ci/./build=pbuilder,distribution=quantal,flavor=armhf/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-ci/./build=pbuilder,distribution=quantal,flavor=i386/42/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/session-manager-ci/42/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

123 -device=`grep Hardware /proc/cpuinfo | awk '{print $3}'`
124 +device=$(grep ro.cm.device /system/build.prop |sed -e 's/.*=//')

Here we should use ro.product.device instead, as that would also cover people porting the devices based on AOSP or any other !CM based images.

111 +# /proc is is not properly mapped yet, so we need to use ps to find the
112 +# right pid to be able to modify oom_adj
113 +echo $DEFAULT_OOMADJ > /proc/$(pgrep ubuntu-session)/oom_adj

Here we don't need to use ps/pgrep to find the correct pid anymore, so we could something smarter to avoid the possibility of another process called ubuntu-session (that's why the old code was using the entire path). Maybe using $$?

review: Needs Fixing

[Oliver Grawert (ogra)]

i'm not sure i like the switch to ro.product.device. While you are indeed right that we could more easily support non CM builds i fear that we will find a lot of devices with spaces or special chars (like slashes and brackets) in their naming scheme in that property.

Switching the OOMADJ to $$ now ...

[lp:~ogra/session-manager/posix-rewrite]

47. By Oliver Grawert on 2013-03-20

switch OOMADJ pid setting from pgrep to $$

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/session-manager-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-armhf-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-i386-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/session-manager-ci/1/rebuild

review: Approve (continuous-integration)

[lp:~ogra/session-manager/posix-rewrite]

48. By Oliver Grawert on 2013-03-20

move device matching to ro.product.device, drop one obsolete comment, move i9100.conf to GT-I9100.conf

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/session-manager-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/session-manager-ci/2/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

121 +device=$(grep ro.product.device /system/build.prop |sed -e 's/.*=//')

This is not a safe check yet as at the nexus based devices we have an additional line at build.prop which breaks the device argument: "# ro.build.product is obsolete; use ro.product.device".

+ grep ro.product.device /system/build.prop
+ device=mako
# ro.build.product is obsolete; use ro.product.device
+ echo Device=mako
# ro.build.product is obsolete; use ro.product.device

Changing to "121 +device=$(grep ^ro.product.device= /system/build.prop |sed -e 's/.*=//')" fixes the issue.

Other than that it works fine, will work to merge it first thing at my morning.

review: Needs Fixing

[lp:~ogra/session-manager/posix-rewrite]

49. By Oliver Grawert on 2013-03-21

narrow the pattern matching for ro.product.device so we only pick up values and not comments

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/session-manager-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-quantal-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/session-manager-ci/3/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Worked fine, tested with mako, manta, maguro and dlx.

Thanks for the fix, this will improve the porting experience for sure.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-14 00:19:45 +0000
+++ debian/changelog	2013-03-21 13:25:25 +0000
@@ -1,3 +1,16 @@
+ubuntu-session (0.43) quantal; urgency=low
+
+  * rewrite ubuntu-session in distro compliant POSIX, remove all bashisms and
+    tidy it up a bit
+  * switch device pattern matching to cyanogenmod device names
+  * rewrite the kill code so that processes are killed in the reverse order in
+    which they were started
+  * move device specific configs to /etc/ubuntu-session.d/$device.conf, so
+    adding a new device just needs adding of such a conf file
+  * keep the last ubuntu-session log around
+
+ -- Oliver Grawert <[e-mail]>  Fri, 15 Mar 2013 13:31:45 +0100
+
 ubuntu-session (0.42) quantal; urgency=low
 
   * add support for SMDK4210 (Samsung GT-I9100) to ubuntu-session

=== modified file 'debian/ubuntu-session.install'
--- debian/ubuntu-session.install	2013-02-06 14:35:26 +0000
+++ debian/ubuntu-session.install	2013-03-21 13:25:25 +0000
@@ -3,3 +3,4 @@
 etc/dbus-1/system.d
 startup-scripts/* /usr/bin/
 *.override /etc/init
+ubuntu-session.d/* /etc/ubuntu-session.d/

=== modified file 'ubuntu-session'
--- ubuntu-session	2013-03-14 00:19:45 +0000
+++ ubuntu-session	2013-03-21 13:25:25 +0000
@@ -1,106 +1,84 @@
-#!/bin/bash
+#!/bin/sh
+
+set -e
 
 ################################################################################
 # Copyright 2012-2013 Canonical Ltd.
 #
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU 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 
+#
+# 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 General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 export HOME=/home/phablet
+
+logdir=$HOME/.ubuntu-session/logs/
+logfile=$logdir/ubuntu-session.log
+bashrc=$HOME/.bashrc
+
+[ ! -d $logdir ] || mkdir -p $logdir
+[ -e $logfile ] && cp $logfile $logfile.old
+
 echo "Redirecting output to local session logs"
-exec &> "$HOME/.ubuntu-session/logs/ubuntu-session.log"
-
-# Default for any application executed from this script
-DEFAULT_OOMADJ=-10
-
-# /proc is is not properly mapped yet, so we need to use ps to find the
-# right pid to be able to modify oom_adj
-procpid=$(ps aux | grep -m 1 /usr/bin/ubuntu-session | awk -F' ' '{print $2}')
-echo $DEFAULT_OOMADJ > /proc/$procpid/oom_adj
+exec 3>&1 4>&2 >$logfile 2>&1
 
 on_stop()
 {
     echo "Stopping services..."
-    for pid in "${pids[@]}"
-    do
-        tuple=( $pid )
-        echo "Stopping ${tuple[0]}"
-        kill ${tuple[1]}
+    for pid in $pids; do
+        echo -n "Stopping $pid"
+        if kill $pid >/dev/null 2>&1; then 
+            echo " done"
+        else
+            echo " failed"
+        fi
     done
     echo "Killing session bus..."
     kill ${DBUS_SESSION_BUS_PID}
     echo "Session stopped."
 }
 
+trap on_stop EXIT INT QUIT ILL KILL SEGV TERM
+
+# Default for any application executed from this script
+DEFAULT_OOMADJ=-10
+echo $DEFAULT_OOMADJ > /proc/$$/oom_adj
+
 # Initialize environment
-for var in $(cat /etc/environment);
-do
-    export $var;
+for var in $(cat /etc/environment); do
+    export $var
 done
 
-device=`grep Hardware /proc/cpuinfo | awk '{print $3}'`
+device=$(grep ^ro.product.device= /system/build.prop |sed -e 's/.*=//')
 echo "Device=$device"
 
-if [ "$device" == "Manta" ]; then
-    services="/etc/tablet-services"
-    grep -q GRID_UNIT_PX /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export GRID_UNIT_PX=20" >> /home/phablet/.bashrc
-    export GRID_UNIT_PX=20
-    grep -q QTWEBKIT_DPR /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export QTWEBKIT_DPR=2.5" >> /home/phablet/.bashrc
-    export QTWEBKIT_DPR=2.5
-    export FORM_FACTOR="tablet"
-elif [ "$device" == "grouper" ]; then
-    services="/etc/tablet-services"
-    grep -q GRID_UNIT_PX /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export GRID_UNIT_PX=14" >> /home/phablet/.bashrc
-    export GRID_UNIT_PX=14
-    grep -q QTWEBKIT_DPR /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export QTWEBKIT_DPR=1.3" >> /home/phablet/.bashrc
-    export QTWEBKIT_DPR=1.3
-    export FORM_FACTOR="tablet"
-elif [ "$device" == "HTC DNA" ]; then
-    services="/etc/phone-services"
-    grep -q GRID_UNIT_PX /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export GRID_UNIT_PX=30" >> /home/phablet/.bashrc
-    export GRID_UNIT_PX=30
-    grep -q QTWEBKIT_DPR /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export QTWEBKIT_DPR=2.5" >> /home/phablet/.bashrc
-    export QTWEBKIT_DPR=2.5
-    export FORM_FACTOR="phone"
-elif [ "$device" == "SMDK4210" ]; then
-    services="/etc/phone-services"
-    grep -q GRID_UNIT_PX /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export GRID_UNIT_PX=12" >> /home/phablet/.bashrc
-    export GRID_UNIT_PX=12
-    grep -q QTWEBKIT_DPR /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export QTWEBKIT_DPR=1.2" >> /home/phablet/.bashrc
-    export QTWEBKIT_DPR=1.2
-    export FORM_FACTOR="phone"
-else
-    services="/etc/phone-services"
-    grep -q GRID_UNIT_PX /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export GRID_UNIT_PX=18" >> /home/phablet/.bashrc
-    export GRID_UNIT_PX=18
-    grep -q QTWEBKIT_DPR /home/phablet/.bashrc
-    [ $? -ne 0 ] && echo "export QTWEBKIT_DPR=2.0" >> /home/phablet/.bashrc
-    export QTWEBKIT_DPR=2.0
-    export FORM_FACTOR="phone"
-fi
+# defaults
+GRID_UNIT_PX=18
+QTWEBKIT_DPR=2.0
+FORM_FACTOR="phone"
+
+# override defaults by sourcing /etc/ubuntu-session.d/$device.conf
+[ -e /etc/ubuntu-session.d/$device.conf ] && . /etc/ubuntu-session.d/$device.conf
+
+grep -q GRID_UNIT_PX $bashrc || echo "export GRID_UNIT_PX=${GRID_UNIT_PX}" >> $bashrc
+grep -q QTWEBKIT_DPR $bashrc || echo "export QTWEBKIT_DPR=${QTWEBKIT_DPR}" >> $bashrc
+
+export GRID_UNIT_PX=${GRID_UNIT_PX}
+export QTWEBKIT_DPR=${QTWEBKIT_DPR}
+export FORM_FACTOR=${FORM_FACTOR}
+
 
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
     echo "Starting session bus"
-    export `dbus-launch`
+    export $(dbus-launch)
     if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
         echo "Unable to start session bus"
         exit 1
@@ -110,27 +88,23 @@
 echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" > $HOME/.dbus-session
 echo "DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID}" >> $HOME/.dbus-session
 
-if [ ! -d "$HOME/.ubuntu-session/logs/" ]; then
-    mkdir -p "$HOME/.ubuntu-session/logs"
-fi
-
 while read service; do
-    service=( $service )
-    arguments=${service[@]:2}
-    service_path=( $(echo "${service[1]}" | tr "/" " ") )
-    binary=${service_path[${#service_path[@]}-1]}
-    sleep ${service[0]}
-    ${service[1]} $arguments &> "$HOME/.ubuntu-session/logs/$binary.log" &
-    pids=("${pids[@]}" "${service[1]} $!")
-    echo "Started ${service[1]} with pid $! (${service[0]} secs start delay)"
-    if [ ${service[1]} == "qml-phone-shell" ]; then
+    delay=$(echo $service|awk '{print $1}')
+    command=$(echo $service|awk '{print $2}')
+    args=$(echo $service|awk '{$1=$2=""; print}'|sed -e 's/^[ \t]*//')
+
+    if $(echo $command|grep -q /); then
+        command=$(basename $command)
+    fi
+    sleep $delay
+    $command $args >"$HOME/.ubuntu-session/logs/$command.log" 2>&1 &
+    pids="$! $pids"
+    echo "Started $command with pid $! ($delay secs start delay)"
+    if [ "$command" = "qml-phone-shell" ]; then
         shell_pid=$!
-        echo "Got Shell pid = ${shell_pid}"
+        echo "Got Shell pid = $shell_pid"
     fi
-
-done < "$services"
-
-trap 'on_stop' TERM
+done < /etc/$FORM_FACTOR-services
 
 wait $shell_pid
 on_stop

=== added directory 'ubuntu-session.d'
=== added file 'ubuntu-session.d/GT-I9100.conf'
--- ubuntu-session.d/GT-I9100.conf	1970-01-01 00:00:00 +0000
+++ ubuntu-session.d/GT-I9100.conf	2013-03-21 13:25:25 +0000
@@ -0,0 +1,3 @@
+GRID_UNIT_PX=12
+QTWEBKIT_DPR=1.2
+FORM_FACTOR="phone"

=== added file 'ubuntu-session.d/dlx.conf'
--- ubuntu-session.d/dlx.conf	1970-01-01 00:00:00 +0000
+++ ubuntu-session.d/dlx.conf	2013-03-21 13:25:25 +0000
@@ -0,0 +1,3 @@
+GRID_UNIT_PX=30
+QTWEBKIT_DPR=2.5
+FORM_FACTOR="phone"

=== added file 'ubuntu-session.d/grouper.conf'
--- ubuntu-session.d/grouper.conf	1970-01-01 00:00:00 +0000
+++ ubuntu-session.d/grouper.conf	2013-03-21 13:25:25 +0000
@@ -0,0 +1,3 @@
+GRID_UNIT_PX=14
+QTWEBKIT_DPR=1.3
+FORM_FACTOR="tablet"

=== added file 'ubuntu-session.d/manta.conf'
--- ubuntu-session.d/manta.conf	1970-01-01 00:00:00 +0000
+++ ubuntu-session.d/manta.conf	2013-03-21 13:25:25 +0000
@@ -0,0 +1,3 @@
+GRID_UNIT_PX=20
+QTWEBKIT_DPR=2.5
+FORM_FACTOR="tablet"