X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=usttrace;h=a60440c8e0039e4feee4ae0e9f3629cb3020372e;hp=52c378dfbd12041636f1630e7b82d49ee51bcbb6;hb=9ccc06995be4faca3f55afd843db285ebce70e2c;hpb=2b3c64a412053525cff6233a963f37f4bfbdb284

diff --git a/usttrace b/usttrace
index 52c378d..a60440c 100755
--- a/usttrace
+++ b/usttrace
@@ -3,12 +3,28 @@
 # usttrace  by Pierre-Marc Fournier 2009
 # Distributed under the GPLv2.
 
-USTTRACE_DIR="$(dirname $0)"
-USTD="${USTTRACE_DIR}/ustd/ustd"
-LIBINTERFORK_PATH="${USTTRACE_DIR}/libinterfork/.libs/libinterfork.so"
-LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libmallocwrap/.libs/libmallocwrap.so"
+function error() {
+	echo "$0: error: $1" 2>/dev/stderr
+}
 
-STD_LDLIBRARY_UST="${USTTRACE_DIR}/libust/.libs"
+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"
+    LIBUST_PATH="${USTTRACE_DIR}/libust/.libs/libust.so"
+else
+    # Use the libraries that the dynamic link finds
+    USTD="ustd"
+    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="libinterfork.so"
+    LIBMALLOCWRAP_PATH="libmallocwrap.so"
+    LIBUST_PATH="libust.so.0"
+fi
 
 BASE_TRACE_DIR="${HOME}/.usttraces"
 
@@ -24,10 +40,6 @@ function usage () {
 	echo "    -s    Use system-wide daemon instead of creating one for this session." 2>/dev/stderr
 }
 
-function error() {
-	echo "$0: error: $1" 2>/dev/stderr
-}
-
 while getopts ":hlLmfs" options; do
 	case $options in
 		l) arg_preload_libust=1;;
@@ -45,14 +57,8 @@ while getopts ":hlLmfs" options; do
 done
 shift $(($OPTIND - 1))
 
-if [ ! -x "$USTD" ];
-then
-	error "specified path to ustd not executable ($USTD)"
-	exit 1
-fi
-
 # Prepare vars
-CMD=$1
+CMD=$*
 
 # Validate input
 if [ -z "$HOME" ];
@@ -72,43 +78,55 @@ DATESTRING="$(hostname)-$(date +%Y%m%d%H%M%S)"
 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"
 	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
-export UST_TRACE=1
-export UST_AUTOPROBE=1
-
-if [ "$arg_preload_libust" = "1" ];
-then
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./libust/.libs"
-	export LD_PRELOAD="$LD_PRELOAD:./libust/.libs/libust.so"
-fi
-
-if [ "$arg_ld_std_ust" = "1" ];
-then
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$STD_LDLIBRARY_UST"
-fi
-
-if [ "$arg_preload_malloc" = "1" ];
-then
-	export LD_PRELOAD="$LD_PRELOAD:./libmallocwrap/.libs/libmallocwrap.so"
-fi
-
-if [ "$arg_preload_fork" = "1" ];
-then
+(
+    export UST_TRACE=1
+    export UST_AUTOPROBE=1
+
+    if [ "$arg_preload_libust" = "1" ];
+    then
+	if [ -n "${LIBUST_PATH%libust.so}" ] ; then
+	    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBUST_PATH%libust.so}"
+	fi
+	export LD_PRELOAD="$LD_PRELOAD:$LIBUST_PATH"
+    fi
+
+    if [ "$arg_ld_std_ust" = "1" ];
+    then
+	if [ -n "$${LIBUST_PATH%libust.so}" ] ; then
+	    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBUST_PATH%libust.so}"
+	fi
+    fi
+
+    if [ "$arg_preload_malloc" = "1" ];
+    then
+	export LD_PRELOAD="$LD_PRELOAD:$LIBMALLOCWRAP_PATH"
+    fi
+
+    if [ "$arg_preload_fork" = "1" ];
+    then
 	export LD_PRELOAD="$LD_PRELOAD:$LIBINTERFORK_PATH"
-fi
+    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,
@@ -117,7 +135,8 @@ fi
 # because of a unhandled signal.
 
 # Execute the command
-bash -c "$CMD" 2>&1 | tee "$OUTDIR/app.log"
+    $CMD 2>&1
+) | tee "$OUTDIR/app.log"
 
 ## Because of the keepalive mechanism, we're sure that by the time
 ## we get here, the daemon is connected to all the buffers that still exist.
@@ -129,7 +148,7 @@ then
 	kill -SIGTERM "$USTDPID"
 
 	echo "Waiting for ustd to shutdown..."
-	wait "$(USTDPID)"
+	wait "$USTDPID"
 
 	rm "$pidfilepath"
 fi