From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Fri, 12 Feb 2010 23:01:16 +0000 (-0500)
Subject: usttrace: add signal handler to prevent ustd from keeping running after usttrace... 
X-Git-Tag: v0.2~15
X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=87d40fcfac1d133efc27f9bd32a7509f586f358a

usttrace: add signal handler to prevent ustd from keeping running after usttrace is killed
---

diff --git a/usttrace b/usttrace
index a60440c..4f6f1f2 100755
--- a/usttrace
+++ b/usttrace
@@ -7,6 +7,22 @@ function error() {
 	echo "$0: error: $1" 2>/dev/stderr
 }
 
+function sighandler() {
+	echo "Caught Ctrl-C"
+	if [ -z "$USTDPID" ]; then
+		USTDPID="$(<$pidfilepath)"
+	fi
+	# Tell the daemon to die
+	kill -SIGTERM "$USTDPID"
+
+	echo "Waiting for ustd to shutdown..."
+	wait "$USTDPID"
+
+	rm "$pidfilepath"
+
+	exit 0;
+}
+
 USTTRACE_DIR="$(dirname $0)"
 if [ -x "${USTTRACE_DIR}/ustd/ustd" ] ; then
     # Use the not installed libraries instead
@@ -84,6 +100,7 @@ USTDSOCKPATH="/tmp/ustd-sock-$$"
 if [ "$arg_syswide_daemon" != "1" ];
 then
 	pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ustd-pid"
+	trap "sighandler $pidfilepath" SIGINT
 	mkfifo -m 0600 "$pidfilepath"
 	# Start daemon
 	$USTD --pidfile "$pidfilepath" -s "$USTDSOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &