Merge branch 'master' into benchmark

[lttng-tools.git] / benchmark / run-boot-time.sh

diff --git a/benchmark/run-boot-time.sh b/benchmark/run-boot-time.sh
index dabb707b9aacaa0020eb9152b5f7c415f93329bf..002ebf84b13aa2a237ce39a7cd56476457bf7e21 100755 (executable)
--- a/benchmark/run-boot-time.sh
+++ b/benchmark/run-boot-time.sh
@@ -17,35 +17,35 @@
 # 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 "Starting session daemon"
 
-$BASEDIR/../ltt-sessiond/$SESSIOND_BIN --daemonize --quiet
-if [ $? -ne 0 ]; then
+BENCH_BOOT_PROCESS=1 $BASEDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN -v >/dev/null 2>&1 &
+
+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 the benchmark to run
 echo -n "Waiting."
 sleep 1
 echo -n "."
 sleep 1
-echo -n "."
+echo "."
 sleep 1
 
 kill $PID_SESSIOND
 
-echo -e "\nResults will be available shortly in $RESULTS_PATH"
-echo ""
+wait $PID_SESSIOND
 
-tail -F $RESULTS_PATH --pid $PID_SESSIOND 2>/dev/null
+echo "Benchmarks done in $RESULTS_PATH"
 
 exit 0