From: Jan Blunck <jblunck@suse.de>
Date: Sun, 18 Oct 2009 20:39:24 +0000 (+0200)
Subject: Fix waiting for ustd on shutdown
X-Git-Tag: v0.1~81
X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=8232f1db6950f4c5bc0611a30e9b8f2d70618644

Fix waiting for ustd on shutdown

When starting the daemon use a fifo instead of a pidfile. Otherwise the start
races against the reading of the pidfile. During shutdown we should wait for
all the existing background shells (there is only one) instead of waiting
for the pid of the daemon process.

Signed-off-by: Jan Blunck <jblunck@suse.de>
---

diff --git a/usttrace b/usttrace
index fe8a5cd..b3af05d 100755
--- a/usttrace
+++ b/usttrace
@@ -78,7 +78,7 @@ SOCKPATH="/tmp/ust-sock-$$"
 if [ "$arg_syswide_daemon" != "1" ];
 then
 	pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ustd-pid"
-
+	mkfifo -m 0600 "$pidfilepath"
 	# Start daemon
 	$USTD -d --pidfile "$pidfilepath" -s "$SOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &
 	USTDPID="$(<$pidfilepath)"
@@ -129,7 +129,7 @@ then
 	kill -SIGTERM "$USTDPID"
 
 	echo "Waiting for ustd to shutdown..."
-	wait "$USTDPID"
+	wait
 
 	rm "$pidfilepath"
 fi