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
fi
LIBINTERFORK_PATH="libinterfork.so"
LIBMALLOCWRAP_PATH="libmallocwrap.so"
- LIBUST_PATH="libust.so"
+ LIBUST_PATH="libust.so.0"
fi
BASE_TRACE_DIR="${HOME}/.usttraces"
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 &
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"