X-Git-Url: https://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=usttrace;h=6ffc988c4d52b4620325f536b4049803a9d1c2a7;hp=fac84a1de6f3d0d93f547b2c9166c7891bf3bc75;hb=a4e826d7ad30a0a6d68c04e585a51849d4aa6509;hpb=155887202b20bc1c5e9b4c6054a80135c3273d32

diff --git a/usttrace b/usttrace
index fac84a1..6ffc988 100755
--- a/usttrace
+++ b/usttrace
@@ -7,12 +7,28 @@ 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
     USTD="${USTTRACE_DIR}/ustd/ustd"
-    LIBINTERFORK_PATH="${USTTRACE_DIR}/libinterfork/.libs/libinterfork.so"
-    LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libmallocwrap/.libs/libmallocwrap.so"
+    LIBINTERFORK_PATH="${USTTRACE_DIR}/libustfork/.libs/libustfork.so"
+    LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libustinstr-malloc/.libs/libustinstr-malloc.so"
     LIBUST_PATH="${USTTRACE_DIR}/libust/.libs/libust.so"
 else
     # Use the libraries that the dynamic link finds
@@ -21,9 +37,9 @@ else
         error "cannot find an executable ustd; make sure its location is in the PATH"
         exit 1
     fi
-    LIBINTERFORK_PATH="libinterfork.so"
-    LIBMALLOCWRAP_PATH="libmallocwrap.so"
-    LIBUST_PATH="libust.so"
+    LIBINTERFORK_PATH="libustfork.so"
+    LIBMALLOCWRAP_PATH="libustinstr-malloc.so"
+    LIBUST_PATH="libust.so.0"
 fi
 
 BASE_TRACE_DIR="${HOME}/.usttraces"
@@ -40,13 +56,14 @@ function usage () {
 	echo "    -s    Use system-wide daemon instead of creating one for this session." 2>/dev/stderr
 }
 
-while getopts ":hlLmfs" options; do
+while getopts ":hlLmfsW" options; do
 	case $options in
 		l) arg_preload_libust=1;;
 		L) arg_ld_std_ust=1;;
 		m) arg_preload_malloc=1;;
 		f) arg_preload_fork=1;;
 		s) arg_syswide_daemon=1;;
+		W) where=1;;
 		h) usage;
 		   exit 0;;
 		\?) usage
@@ -57,6 +74,11 @@ while getopts ":hlLmfs" options; do
 done
 shift $(($OPTIND - 1))
 
+if [ -n "$where" ]; then
+	echo $BASE_TRACE_DIR/$(ls "$BASE_TRACE_DIR" | tail -n 1)
+	exit 0
+fi
+
 # Prepare vars
 CMD=$*
 
@@ -74,7 +96,7 @@ then
 fi
 
 # Create directory for trace output
-DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S)"
+DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S%N)"
 OUTDIR="$BASE_TRACE_DIR/$DATESTRING"
 mkdir -p "$OUTDIR"
 
@@ -84,6 +106,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 &
@@ -128,12 +151,6 @@ fi
 	export LD_PRELOAD="$LD_PRELOAD:$LIBINTERFORK_PATH"
     fi
 
-# Install a handler for SIGIO. This is the signal that will be sent by ustd to
-# the traced program to trigger the creation of its listener thread. However,
-# it is possible that the SIGIO will be sent after the shell fork, but before
-# the exec of the command. If this handler isn't there, bash might terminate
-# because of a unhandled signal.
-
 # Execute the command
     $CMD 2>&1
 ) | tee "$OUTDIR/app.log"