From: Julien Desfossez <julien.desfossez@polymtl.ca>
Date: Thu, 17 Feb 2011 15:24:12 +0000 (-0500)
Subject: Only run the appropriate cleanup command on stap
X-Git-Url: http://git.lttng.org/?p=benchmarks.git;a=commitdiff_plain;h=6e4432775f633463c49bd06db1cbbf7f7a456720

Only run the appropriate cleanup command on stap

Signed-off-by: Julien Desfossez <julien.desfossez@polymtl.ca>
---

diff --git a/ust-systemtap-tracepoints/runtest.sh b/ust-systemtap-tracepoints/runtest.sh
index 752916b..f4d5424 100644
--- a/ust-systemtap-tracepoints/runtest.sh
+++ b/ust-systemtap-tracepoints/runtest.sh
@@ -6,6 +6,7 @@ BINARY=tracepoint_benchmark
 REPORT=/tmp/testreport
 TMPLOG=/tmp/testlog
 WRAPPER=""
+CLEANUP=""
 STAP=stap
 STAPTMP=/tmp/stapconsole
 STAPPROBE=testutrace.stp
@@ -55,9 +56,11 @@ case "$1" in
 		;;
 	stap_flight_recorder)
 		TEST=stap_flight_recorder
+		CLEANUP="rmmod $BINARY 2>/dev/null"
 		;;
 	stap_disk)
 		TEST=stap_disk
+		CLEANUP="killall stapio 2>/dev/null"
 		;;
 	*)
 		echo "Usage : $0 {ust_flight_recorder|ust_disk|stap_flight_recorder|stap_disk}"
@@ -70,9 +73,7 @@ for nr_threads in 1 2 4 8; do
 	echo Number of threads: $nr_threads | tee >> $REPORT
 	echo -n "* Baseline : " | tee >> $REPORT
 
-	# just some cleanup
-	killall stapio 2>/dev/null
-	rmmod $BINARY 2>/dev/null
+	$CLEANUP
 
 	sync
 	/usr/bin/time -f "%E" -o $TMPLOG ./$BINARY ${nr_threads}