Merge lp:~ted/ubuntu-touch-session/indicator-sound-override-v2 into lp:ubuntu-touch-session

[Ted Gould]

Override indicator sound to wait for Pulse to be ready

Part duex

Leaving in the Pulse post-start condition so that other people could wait on it if they wanted. But changing indicator-sound to have the same code as a pre-start condition so it'll wait for Pulse.

[Niklas Wenzel (nikwen)]

Shouldn't it also wait for unity-notifications to come up in order to fix the bug you linked?
https://bugs.launchpad.net/ubuntu-rtm/+source/unity8/+bug/1389008

review: Needs Information

[Ted Gould (ted)]

On Sun, 2014-11-16 at 11:24 +0000, Niklas Wenzel wrote:

> Shouldn't it also wait for unity-notifications to come up in order to fix the bug you linked?

Ideally, but the problem is that we don't get any signal for that. Unity
8 reports that it is ready when the Mir socket is ready and doesn't have
any reporting about when it loads and initialize all of its individual
plugins.

[Charles Kerr (charlesk)]

Ted, I agree with the basic idea but the implementation looks pretty aggressive compared to the other override & conf scripts -- waking 10x per second with no timeout condition to end the loop.

On the one hand, if [ -S /run/user/`id -u`/pulse/dbus-socket ] fails then wakeups are not the most important problem we've got. OTOH we should at least have a timeout to break out of the while loop.

[lp:~ted/ubuntu-touch-session/indicator-sound-override-v2]

245. By Ted Gould on 2014-11-20

Switch to a limited loop and stop if we don't ever get the socket in 5 seconds

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== added file 'upstart-session/indicator-sound.override'
--- upstart-session/indicator-sound.override	1970-01-01 00:00:00 +0000
+++ upstart-session/indicator-sound.override	2014-11-20 23:06:12 +0000
@@ -0,0 +1,15 @@
+
+# Ensure that Pulse is up before we are, which we unfortunately can't
+# encode in start conditions because we might need to be started more
+# than once where Pulse is only started once. This happens in the case
+# of the wizard which starts and stops the indicators once and then
+# unity restarts them
+
+pre-start script
+	for num in  {1..50}; do
+		[ -S /run/user/`id -u`/pulse/dbus-socket ] && break
+		sleep 0.1
+	done
+
+	[ -S /run/user/`id -u`/pulse/dbus-socket ] || stop
+end script

=== modified file 'upstart-session/pulseaudio.conf'
--- upstart-session/pulseaudio.conf	2014-11-12 17:46:17 +0000
+++ upstart-session/pulseaudio.conf	2014-11-20 23:06:12 +0000
@@ -17,3 +17,15 @@
 end script
 
 exec pulseaudio --start --log-target=syslog
+
+# Upstart tracks fork() calls, but what Pulse does is fork early
+# and then block on a write to a socket. So Upstart thinks that
+# it has started while Pulse is still initializing. This stops
+# the started event from happening until the dbus-socket is ready
+# for people to connect to it.
+post-start script
+	while true; do
+		[ -S /run/user/`id -u`/pulse/dbus-socket ] && break
+		sleep 0.1
+	done
+end script