X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/0cc4beeb70878612dd686c1d0ba9fadbe2ecd3e1..20b3deb1d2a53e85261e1db2d30ff1a7140be018:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 3ea4153..aa05a26 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -1,7 +1,17 @@
 set -e
 
+while [ $# -gt 0 ]; do
+    case "$1" in
+	-P) OPT_PLOT_DISABLE=1; shift;;
+	-p) OPT_PLOT_ONLY=1; shift;;
+	-X|--no-x11-plot) OPT_NO_X11=1; shift;;
+    esac
+done
+
 PATH=$PWD/../_compiled/bin/:$PATH
 
+COUNT=10000
+
 error() {
     echo $1 >&2
     exit 1
@@ -20,38 +30,32 @@ sshgw() {
 }
 
 cleanupgw() {
-    # Set can interfaces up
-    sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
-    # Delete all GW rules
-    sshgw 'eval $(cangw -L|sed -e s/-A/-D/ -e "s/#.*/;/")'
+    sshgw 'cangw -F'
 }
 
-plot() {
-#    for i in "${!PLOT_CMD[@]}"; do
+_plot() {
     local testname=`basename $0 .sh`
-    for i in 0; do
-	cmd=`p`			# Get plot commands
-	cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($(kvers), CPU\\\\\\\\@${clk}MHz)\"/")
-	if [ -z "$OPT_NO_X11" ]; then
-	    echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
-	fi
-	I=${i/0/}
-	echo 'set terminal postscript color eps enhanced size 6cm,4cm lw 1 "Times-Roman" 10;' \
-	     'set lmargin 8;' \
-	      "${cmd}" | gnuplot > ${testname}$I.eps
-	echo "set terminal postscript color eps enhanced;" \
-	     "${cmd}" | gnuplot | epstopdf --filter > ${testname}$I.pdf
-	mkdir -p thumb
-	convert -density 30  -gamma 0.5 -quality 90 -type Palette -depth 8 ${testname}$I.pdf thumb/${testname}$I.png
-	convert -density 150 -gamma 0.7 -quality 90 -type Palette -depth 8 ${testname}$I.pdf ${testname}$I.png
-    done
+
+    plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/" > plot.gp
+    if [ -z "$OPT_NO_X11" ]; then
+	echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
+    fi
+    I=''
+    echo 'set terminal postscript color eps enhanced size 6cm,4cm lw 1 "Times-Roman" 10;' \
+	'set lmargin 8;' \
+	"$(< plot.gp)" | gnuplot > ${testname}$I.eps
+    echo "set terminal postscript color eps enhanced;" \
+	"$(< plot.gp)" | gnuplot | epstopdf --filter > ${testname}$I.pdf
+    mkdir -p thumb
+    convert -density 30  -gamma 0.5 -quality 90 -type Palette -depth 8 ${testname}$I.pdf thumb/${testname}$I.png
+    convert -density 150 -gamma 0.7 -quality 90 -type Palette -depth 8 ${testname}$I.pdf ${testname}$I.png
+
 }
 
 create_dirs_and_links() {
     local test=$1
     local kver=$2
 
-    set -x
     local  d=results/by-kern/$kver/$test
     mkdir -p $d
     mkdir -p results/by-test/$test
@@ -59,24 +63,59 @@ create_dirs_and_links() {
     echo $d
 }
 
+echo_plot() {
+    plot=$1
+    [[ "$_plot_separator" ]] && echo ", \\"
+    _plot_separator=t
+    echo -n "    " $plot
+}
+
 _run() {
-    cleanupgw
-    dir=$(create_dirs_and_links $(basename $0 .sh)  $(sshgw uname -r))
-    cd $dir
-    main
+    if [[ ! "$OPT_PLOT_ONLY" ]]; then
+	kernel_versions=$(sshgw uname -r)
+    else
+	kernel_versions=$(ls results/by-kern)
+    fi
+    for kvers in $kernel_versions; do
+	dir=$(create_dirs_and_links $(basename $0 .sh) $kvers)
+	script=$PWD/$0
+	cd $dir
+	echo "Working directory: $dir"
+	if [[ ! "$OPT_PLOT_ONLY" ]]; then
+	    # Remove data from the last measurement
+	    rm -rf *
+            # Set can interfaces up
+	    sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
+            # Delete all vcan interfaces
+	    sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
+	    cleanupgw
+	    
+	    main
+	    cp $script .
+	fi
+	if [[ ! "$OPT_PLOT_DISABLE" ]]; then
+	    _plot
+	fi
+    done
 }
 
 test_end() {
     test_end_called=t
-    trap '' DEBUG
+    exit_ok=
     _run
+    exit_ok=t
 }
 
-exit() {
+_myexit() {
+    code=$?
+    cmd=$BASH_COMMAND
     if [[ ! "$test_end_called" ]]; then
 	test_end_called=t
 	error "bug in the test script: No test_end called"
     fi
+    if ! test -n "$exit_ok"; then
+	error "FATAL: Command '$cmd' exited with code $code"
+    fi
 }
 
-trap 'exit' EXIT
+trap '_myexit' EXIT