ustd: fix opening mode of pidfile to support writing to fifos

[ust.git] / usttrace

diff --git a/usttrace b/usttrace
index 689cdded2f66b3289f661e2f9ed003a5a9038ac9..6cd3bf2194f8d6d6d517a66fd96516751ae68ff3 100755 (executable)
--- a/usttrace
+++ b/usttrace
@@ -4,11 +4,19 @@
 # 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"
-
-STD_LDLIBRARY_UST="${USTTRACE_DIR}/libust/.libs"
+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"
+    LIBINTERFORK_PATH="libinterfork.so"
+    LIBMALLOCWRAP_PATH="libmallocwrap.so"
+    LIBUST_PATH="libust.so"
+fi
 
 BASE_TRACE_DIR="${HOME}/.usttraces"
 
@@ -45,14 +53,14 @@ while getopts ":hlLmfs" options; do
 done
 shift $(($OPTIND - 1))
 
-if [ ! -x "$USTD" ];
+if [ ! -x "$USTD" -a ! -x "$(which ustd 2>/dev/null)" ];
 then
        error "specified path to ustd not executable ($USTD)"
        exit 1
 fi
 
 # Prepare vars
-CMD=$1
+CMD=$*
 
 # Validate input
 if [ -z "$HOME" ];
@@ -77,45 +85,43 @@ 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 -s "$SOCKPATH" -o "$OUTDIR" 2>&1 >"$OUTDIR/ustd.log" &
-       USTDPID="$!"
+       $USTD --pidfile "$pidfilepath" -s "$SOCKPATH" -o "$OUTDIR" >"$OUTDIR/ustd.log" 2>&1 &
+       USTDPID="$(<$pidfilepath)"
        export UST_DAEMON_SOCKET="$SOCKPATH"
 fi
 
-# Wait for the daemon to settle
-# If we don't, the process may try to connect to its socket before
-# it's ready.
-# FIXME: is there a way to make sure this works every time? Yes,
-# we could have a mode where ustd daemonizes itself. Therefore
-# by the time the control returns to the console, it's ready.
-
-sleep 0.5
-
 # 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,
@@ -124,7 +130,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.
@@ -137,6 +144,8 @@ then
 
        echo "Waiting for ustd to shutdown..."
        wait "$USTDPID"
+
+       rm "$pidfilepath"
 fi
 
 echo "Trace was output in: " $OUTDIR