usttrace fix variable name clash

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>

diff --git a/tests/manual_mode_tracing.sh b/tests/manual_mode_tracing.sh
index 09f07645ca08515261790f362d6a684bd10e4162..b0df338ea51fa759b9ec80d46bfd963bf9853eef 100755 (executable)
--- a/tests/manual_mode_tracing.sh
+++ b/tests/manual_mode_tracing.sh
@@ -54,7 +54,7 @@ sleep 0.5
 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"

diff --git a/tests/valgrind_ust-consumerd.sh b/tests/valgrind_ust-consumerd.sh
index 53b1208ff38ae998d7533f4a7951aa515b87c1d4..a0d9e443de3030716b48e9217b18398544c5b4fc 100755 (executable)
--- a/tests/valgrind_ust-consumerd.sh
+++ b/tests/valgrind_ust-consumerd.sh
@@ -40,7 +40,7 @@ UST_CONSUMERD_PID="$(<$pidfilepath)"
 
 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"

diff --git a/usttrace b/usttrace
index 5d6729ebe356a59a662db96421cf619676f8c2be..7c34ca2f4107cfe234c66297a2f1c564fbf781f2 100755 (executable)
--- a/usttrace
+++ b/usttrace
@@ -9,14 +9,14 @@ function error() {
 
 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
-       kill -SIGTERM "$UST_CONSUMERDPID"
+       kill -SIGTERM "${UST_CONSUMERD_PID}"
 
        echo "Waiting for ust-consumerd to shutdown..."
-       wait "$UST_CONSUMERDPID"
+       wait "${UST_CONSUMERD_PID}"
 
        rm "$pidfilepath"
 
@@ -118,7 +118,7 @@ if [ ! -d "$OUTDIR" ]; then
 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
@@ -126,7 +126,7 @@ then
        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
@@ -134,8 +134,8 @@ then
        # 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
@@ -206,10 +206,10 @@ fi
 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..."
-       wait "$UST_CONSUMERDPID"
+       wait "${UST_CONSUMERD_PID}"
 
        rm "$pidfilepath"
 fi