# 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
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"
+ LIBUST_PATH="libust.so.0"
fi
BASE_TRACE_DIR="${HOME}/.usttraces"
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;;
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
-fi
-
# Prepare vars
CMD=$*
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
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"
kill -SIGTERM "$USTDPID"
echo "Waiting for ustd to shutdown..."
- wait "$(USTDPID)"
+ wait "$USTDPID"
rm "$pidfilepath"
fi