X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/f7f8937b03d4717bd0a5b70ad97f2368d4e94bf1..41c72639e9e7f2ed299d5101ace714a72e20543c:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index c27cd0d..f82ea28 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -1,76 +1,108 @@
-set -x
 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
 }
 
 sshgw() {
-    ssh root@192.168.2.3 "$@"
+    local socket="$HOME/.ssh/cangw-connection"
+
+    if [[ ! -S $socket ]]; then
+        # Create master connection to speed up subsequenct command.
+        # The ssh is put into background and the connection is closed
+        # after 10 minutes)
+	ssh -f -M -S $socket root@192.168.2.3 sleep 600 > /dev/null 2>&1
+    fi
+    ssh -x -a -S $socket root@192.168.2.3 "$@"
 }
 
-initgw() {
-    sshgw 'for i in 0 1; do ip link set can$i up type can bitrate 1000000; done'
+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/#.*/;/")'
 }
 
-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
+
+    cmd=$(plot_cmds)			# Get plot commands
+    cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/")
+    if [ -z "$OPT_NO_X11" ]; then
+	echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
+    fi
+    I=''
+    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
+
 }
 
 create_dirs_and_links() {
     local test=$1
     local kver=$2
-    local clck=$3
 
-    local  d=results/by-kern/$kver/$clck/$test
+    local  d=results/by-kern/$kver/$test
     mkdir -p $d
-    mkdir -p results/by-kern/$kver/$test # 1
-    mkdir -p results/by-test/$test/$kver # 2
-    mkdir -p results/by-test/$test/$clck # 3
-    mkdir -p results/by-clck/$clck/$kver # 4
-    mkdir -p results/by-clck/$clck/$test # 5
-    ln -sfT ../../../${d#results/} results/by-kern/$kver/$test/$clck # 1
-    ln -sfT ../../../${d#results/} results/by-test/$test/$kver/$clck # 2
-    ln -sfT ../../../${d#results/} results/by-test/$test/$clck/$kver # 3
-    ln -sfT ../../../${d#results/} results/by-clck/$clck/$kver/$test # 4
-    ln -sfT ../../../${d#results/} results/by-clck/$clck/$test/$kver # 5
+    mkdir -p results/by-test/$test
+    ln -sfT ../../${d#results/} results/by-test/$test/$kver
     echo $d
 }
 
-run() {
-    initgw
+_run() {
+    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
+	if [[ ! "$OPT_PLOT_ONLY" ]]; then
+	    cleanupgw
+	    main
+	    cp $script .
+	fi
+	_plot
+    done
 }
 
 test_end() {
     test_end_called=t
-    run
+    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