X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=usttrace;h=dc159f2cdff33897876b9b793bc9474ccc6c5ab7;hb=223f2e7ce070406f507856fa8f0de508d8a05ad3;hp=6cd3bf2194f8d6d6d517a66fd96516751ae68ff3;hpb=524a8072fd7fa9b6f93242495b8435ba4a1d5622;p=ust.git

diff --git a/usttrace b/usttrace
index 6cd3bf2..dc159f2 100755
--- a/usttrace
+++ b/usttrace
@@ -3,19 +3,43 @@
 # usttrace  by Pierre-Marc Fournier 2009
 # Distributed under the GPLv2.
 
+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
     USTD="ustd"
-    LIBINTERFORK_PATH="libinterfork.so"
-    LIBMALLOCWRAP_PATH="libmallocwrap.so"
-    LIBUST_PATH="libust.so"
+    if [ ! -x "$(which ustd 2>/dev/null)" ]; then
+        error "cannot find an executable ustd; make sure its location is in the PATH"
+        exit 1
+    fi
+    LIBINTERFORK_PATH="libustfork.so"
+    LIBMALLOCWRAP_PATH="libustinstr-malloc.so"
+    LIBUST_PATH="libust.so.0"
 fi
 
 BASE_TRACE_DIR="${HOME}/.usttraces"
@@ -30,19 +54,20 @@ function usage () {
 	echo "    -m    Instrument malloc calls." 2>/dev/stderr
 	echo "    -f    Also trace forked processes." 2>/dev/stderr
 	echo "    -s    Use system-wide daemon instead of creating one for this session." 2>/dev/stderr
+	echo "    -S    Specify the subbuffer size." 2>/dev/stderr
+	echo "    -N    Specify the number of subbuffers." 2>/dev/stderr
 }
 
-function error() {
-	echo "$0: error: $1" 2>/dev/stderr
-}
-
-while getopts ":hlLmfs" options; do
+while getopts ":hlLmfsWS:N:" 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;;
+		S) export UST_SUBBUF_SIZE=$OPTARG;;
+		N) export UST_SUBBUF_NUM=$OPTARG;;
 		h) usage;
 		   exit 0;;
 		\?) usage
@@ -53,10 +78,9 @@ while getopts ":hlLmfs" options; do
 done
 shift $(($OPTIND - 1))
 
-if [ ! -x "$USTD" -a ! -x "$(which ustd 2>/dev/null)" ];
-then
-	error "specified path to ustd not executable ($USTD)"
-	exit 1
+if [ -n "$where" ]; then
+	echo $BASE_TRACE_DIR/$(ls "$BASE_TRACE_DIR" | tail -n 1)
+	exit 0
 fi
 
 # Prepare vars
@@ -76,21 +100,29 @@ 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"
 
-# Choose socket path
-SOCKPATH="/tmp/ust-sock-$$"
+# Choose ustd socket path
+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 "$SOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &
+	$USTD --pidfile "$pidfilepath" -s "$USTDSOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &
+	# ustd sets up its server socket
+	# ustd opens the pidfile, blocks because no one has opened it
+	# we open pidfile
+	# we block reading pidfile
+	# ustd writes to pidfile
+	# ustd closes pidfile
+	# we unblock reading pidfile
 	USTDPID="$(<$pidfilepath)"
-	export UST_DAEMON_SOCKET="$SOCKPATH"
+	export UST_DAEMON_SOCKET="$USTDSOCKPATH"
 fi
 
 # Establish the environment for the command
@@ -123,12 +155,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"