libustfork: link against libust

[ust.git] / usttrace

diff --git a/usttrace b/usttrace
index 5d6729ebe356a59a662db96421cf619676f8c2be..af80faf76afd3adf7eae740e8f75bc5a910e5abd 100755 (executable)
--- a/usttrace
+++ b/usttrace
@@ -1,22 +1,22 @@
-#!/bin/bash
+#!/bin/sh
 
 # usttrace  by Pierre-Marc Fournier 2009
 # Distributed under the GPLv2.
 
-function error() {
+error() {
        echo "$0: error: $1" 2>/dev/stderr
 }
 
-function sighandler() {
+sighandler() {
        echo "Caught Ctrl-C"
-       if [ -z "$UST_CONSUMERDPID" ]; then
-               UST_CONSUMERDPID="$(<$pidfilepath)"
+       if [ -z "${UST_CONSUMERD_PID}" ]; then
+               UST_CONSUMERD_PID=`cat $pidfilepath`
        fi
        # Tell the daemon to die
-       kill -SIGTERM "$UST_CONSUMERDPID"
+       kill -TERM "${UST_CONSUMERD_PID}"
 
        echo "Waiting for ust-consumerd to shutdown..."
-       wait "$UST_CONSUMERDPID"
+       wait "${UST_CONSUMERD_PID}"
 
        rm "$pidfilepath"
 
@@ -44,7 +44,7 @@ fi
 
 BASE_TRACE_DIR="${HOME}/.usttraces"
 
-function usage () {
+usage() {
        echo "usage:  $0 OPTIONS COMMAND" 2>/dev/stderr
        echo "" 2>/dev/stderr
        echo "Options:" 2>/dev/stderr
@@ -118,15 +118,15 @@ 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
        pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid"
-       trap "sighandler $pidfilepath" SIGINT
+       trap "sighandler $pidfilepath" INT
        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=`cat $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 -TERM "${UST_CONSUMERD_PID}"
 
        echo "Waiting for ust-consumerd to shutdown..."
-       wait "$UST_CONSUMERDPID"
+       wait "${UST_CONSUMERD_PID}"
 
        rm "$pidfilepath"
 fi