X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=benchmark%2Frun-ust-register.sh;h=96d70a26850d43a133ba0e4605ada7094bd7f0d7;hb=56fe0b922a643df9f95524a32f456ed42802f55a;hp=88e70e0a099585d505efc07f268fce5462013fce;hpb=94ebed1a52e46a2bc0d8538287300345387338f6;p=lttng-tools.git

diff --git a/benchmark/run-ust-register.sh b/benchmark/run-ust-register.sh
index 88e70e0a0..96d70a268 100755
--- a/benchmark/run-ust-register.sh
+++ b/benchmark/run-ust-register.sh
@@ -17,32 +17,37 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-SESSIOND_BIN="ltt-sessiond"
+SESSIOND_BIN="lttng-sessiond"
 RESULTS_PATH="/tmp/lttng-bench-results.txt"
 BASEDIR=`dirname $0`
 
-echo "Session daemon boot process benchmark"
+echo "Session daemon boot"
+BENCH_UST_REGISTER=1 $BASEDIR/../lttng-sessiond/$SESSIOND_BIN -v >/dev/null 2>&1 &
 
-`BENCH_UST_REGISTER=1 $BASEDIR/../ltt-sessiond/$SESSIOND_BIN --daemonize --quiet`
-if [ $? -ne 0 ]; then
+PID_SESSIOND=$!
+if [ -z $PID_SESSIOND ]; then
 	echo -e '\e[1;31mFAILED\e[0m'
 	exit 1
 else
 	echo -e "\e[1;32mOK\e[0m"
+	echo "PID session daemon: $PID_SESSIOND"
 fi
 
-PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-
-# Wait for sessiond to settle
-sleep 2
+# Session daemon need to boot up and run benchmark
+echo -n "Waiting."
+sleep 1
+echo -n "."
+sleep 1
+echo "."
+sleep 1
 
 # Start libust instrumented application to register.
 UST_AUTOPROBE=1 UST_TRACE=1 ./$BASEDIR/hello
 
-echo -e "\nResults will be available shortly in $RESULTS_PATH"
-echo ""
-
 kill $PID_SESSIOND
-tail -F $RESULTS_PATH --pid $PID_SESSIOND 2>/dev/null
+
+wait $PID_SESSIOND
+
+echo "Benchmarks done in $RESULTS_PATH"
 
 exit 0