Fix some variable name errors in the shell scripts. It does not fix my
hang, but might help.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Nils Carlson <nils.carlson@ericsson.com>
okx ustctl --stop-trace $PID
okx ustctl --destroy-trace $PID
kill $PID
okx ustctl --stop-trace $PID
okx ustctl --destroy-trace $PID
kill $PID
-kill -SIGTERM $UST_CONSUMERD_PID
-wait $UST_CONSUMERD_PID
+kill -SIGTERM ${UST_CONSUMERD_PID}
+wait ${UST_CONSUMERD_PID}
trace_matches -N "ust.malloc" "^ust.malloc:" "$TRACE_DIR"
trace_matches -N "ust.malloc" "^ust.malloc:" "$TRACE_DIR"
okx usttrace -s $TESTDIR/basic/.libs/basic
okx usttrace -s $TESTDIR/basic/.libs/basic
-kill -SIGTERM $UST_CONSUMERD_PID
+kill -SIGTERM ${UST_CONSUMERD_PID}
wait $!
echo "Valgrind output is in $VALG_OUT"
wait $!
echo "Valgrind output is in $VALG_OUT"
function sighandler() {
echo "Caught Ctrl-C"
function sighandler() {
echo "Caught Ctrl-C"
- if [ -z "$UST_CONSUMERDPID" ]; then
- UST_CONSUMERDPID="$(<$pidfilepath)"
+ if [ -z "${UST_CONSUMERD_PID}" ]; then
+ UST_CONSUMERD_PID="$(<$pidfilepath)"
fi
# Tell the daemon to die
fi
# Tell the daemon to die
- kill -SIGTERM "$UST_CONSUMERDPID"
+ kill -SIGTERM "${UST_CONSUMERD_PID}"
echo "Waiting for ust-consumerd to shutdown..."
echo "Waiting for ust-consumerd to shutdown..."
- wait "$UST_CONSUMERDPID"
+ wait "${UST_CONSUMERD_PID}"
fi
# Choose ust-consumerd socket path
fi
# Choose ust-consumerd socket path
-UST_CONSUMERDSOCKPATH="/tmp/ust-consumerd-sock-$$"
+UST_CONSUMERD_SOCKPATH="/tmp/ust-consumerd-sock-$$"
if [ "$arg_syswide_daemon" != "1" ];
then
if [ "$arg_syswide_daemon" != "1" ];
then
trap "sighandler $pidfilepath" SIGINT
mkfifo -m 0600 "$pidfilepath"
# Start daemon
trap "sighandler $pidfilepath" SIGINT
mkfifo -m 0600 "$pidfilepath"
# Start daemon
- $UST_CONSUMERD --pidfile "$pidfilepath" -s "$UST_CONSUMERDSOCKPATH" -o "$OUTDIR" >"$OUTDIR/ust-consumerd.log" 2>&1 &
+ ${UST_CONSUMERD} --pidfile "$pidfilepath" -s "${UST_CONSUMERD_SOCKPATH}" -o "$OUTDIR" >"$OUTDIR/ust-consumerd.log" 2>&1 &
# ust-consumerd sets up its server socket
# ust-consumerd opens the pidfile, blocks because no one has opened it
# we open pidfile
# ust-consumerd sets up its server socket
# ust-consumerd opens the pidfile, blocks because no one has opened it
# we open pidfile
# ust-consumerd writes to pidfile
# ust-consumerd closes pidfile
# we unblock reading pidfile
# ust-consumerd writes to pidfile
# ust-consumerd closes pidfile
# we unblock reading pidfile
- UST_CONSUMERDPID="$(<$pidfilepath)"
- export UST_DAEMON_SOCKET="$UST_CONSUMERDSOCKPATH"
+ UST_CONSUMERD_PID="$(<$pidfilepath)"
+ export UST_DAEMON_SOCKET="${UST_CONSUMERD_SOCKPATH}"
fi
# Establish the environment for the command
fi
# Establish the environment for the command
if [ "$arg_syswide_daemon" != "1" ];
then
# Tell the daemon to die
if [ "$arg_syswide_daemon" != "1" ];
then
# Tell the daemon to die
- kill -SIGTERM "$UST_CONSUMERDPID"
+ kill -SIGTERM "${UST_CONSUMERD_PID}"
echo "Waiting for ust-consumerd to shutdown..."
echo "Waiting for ust-consumerd to shutdown..."
- wait "$UST_CONSUMERDPID"
+ wait "${UST_CONSUMERD_PID}"