Fix benchmark scripts to wait PID

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/benchmark/run-boot-time.sh b/benchmark/run-boot-time.sh
index ba57d168d49c27320e56a39e26bfa25b55038956..c17a4fd26165c60556ff08ff210a9a61d8d8df5e 100755 (executable)
--- a/benchmark/run-boot-time.sh
+++ b/benchmark/run-boot-time.sh
@@ -43,9 +43,7 @@ sleep 1
 
 kill $PID_SESSIOND
 
-echo -e "\nResults will be available shortly in $RESULTS_PATH"
-echo ""
-
-tail -F $RESULTS_PATH --pid $PID_SESSIOND 2>/dev/null
+# Trick to wait for a PID which is not a child
+tail --pid=$PID_SESSIOND --quiet -F $RESULTS_PATH > /dev/null 2>&1
 
 exit 0

diff --git a/benchmark/run-ust-notify.sh b/benchmark/run-ust-notify.sh
index 660492a54da7fc8ee9d3c1c488cc7de8bd5abef3..be1544ed551fb04e732d22e97551cd8ac9586e0d 100755 (executable)
--- a/benchmark/run-ust-notify.sh
+++ b/benchmark/run-ust-notify.sh
@@ -33,10 +33,9 @@ fi
 
 PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
-echo -e "\nResults will be available shortly in $RESULTS_PATH"
-echo ""
-
 kill $PID_SESSIOND
-tail -F $RESULTS_PATH --pid $PID_SESSIOND 2>/dev/null
+
+# Trick to wait for a PID which is not a child
+tail --pid=$PID_SESSIOND --quiet -F $RESULTS_PATH > /dev/null 2>&1
 
 exit 0

diff --git a/benchmark/run-ust-register.sh b/benchmark/run-ust-register.sh
index 88e70e0a099585d505efc07f268fce5462013fce..61c76f4db130b2c47dd56d9cc7061ac85fb5d851 100755 (executable)
--- a/benchmark/run-ust-register.sh
+++ b/benchmark/run-ust-register.sh
@@ -21,7 +21,7 @@ SESSIOND_BIN="ltt-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/../ltt-sessiond/$SESSIOND_BIN --daemonize --quiet`
 if [ $? -ne 0 ]; then
@@ -39,10 +39,9 @@ sleep 2
 # 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
+
+# Trick to wait for a PID which is not a child
+tail --pid=$PID_SESSIOND --quiet -F $RESULTS_PATH > /dev/null 2>&1
 
 exit 0

diff --git a/benchmark/runall.sh b/benchmark/runall.sh
index d77694482a0b208b0419347cbf965f20e32e8448..037ac9e3ef313e27d995d61b24b794affbb080db 100755 (executable)
--- a/benchmark/runall.sh
+++ b/benchmark/runall.sh
@@ -19,7 +19,8 @@
 
 #### ADD TESTS HERE ####
 
-test_suite=( "run-boot-time.sh" "run-sessions.sh" "run-ust-register.sh" )
+test_suite=( "run-boot-time.sh" "run-sessions.sh" "run-ust-register.sh" \
+                        "run-ust-notify.sh" )
 
 #### END TESTS HERE ####