X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/4e25bba0f22a675ba1950e2e41fe22dfd60073c9..8c81374c57a81ccab4210951e6374102f4a04d26:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 5d3507f..2fdf1ff 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -15,7 +15,7 @@ while [ $# -gt 0 ]; do
 	-p) OPT_PLOT_ONLY=1; shift;;
 	-X|--no-x11-plot) OPT_NO_X11=1; shift;;
 	-t) case "$2" in
-		all|floof|50|oneatatime) OPT_TRAFFIC=$2;;
+		all|flood|50|oneatatime) OPT_TRAFFIC=$2;;
 		*) error "Unknown traffic specification: $2";;
     	    esac;
     	    shift 2;;
@@ -27,7 +27,7 @@ PATH=$PWD/../_compiled/bin/:$PATH
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
-    if [[ ! -S $socket ]]; then
+    if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then
 	# Create master connection to speed up subsequenct command.
 	# The ssh is put into background and the connection is closed
 	# after 10 minutes)
@@ -44,6 +44,7 @@ _plot() {
     local testname=`basename $0 .sh`
 
     plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/" > plot.gp
+    if [[ ! -s plot.gp ]]; then return; fi
     if [ -z "$OPT_NO_X11" ]; then
 	echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
     fi
@@ -59,16 +60,6 @@ _plot() {
 
 }
 
-create_dirs() {
-    local kver=$1
-    local traffic=$2
-    local test=$3
-
-    local  d=results/$kver/$traffic/$test
-    mkdir -p $d
-    echo $d
-}
-
 echo_plot() {
     plot=$1
     [[ "$_plot_separator" ]] && echo ", \\"
@@ -88,33 +79,41 @@ traffic_and_length() {
 }
 
 _run() {
-    if [[ ! "$OPT_PLOT_ONLY" ]]
-    then kernel_versions=$(sshgw uname -r)
-    else kernel_versions=$(ls results/by-kern)
+    if [[ ! "$OPT_PLOT_ONLY" ]]; then
+	host_kernel_versions=host-$(uname -r)
+	kernel_versions=$(sshgw uname -r)
+    else
+	host_kernel_versions=$(cd results; ls -d host-*)
+	kernel_versions=$(cd results/host-$(uname -r)/; ls)
     fi
     if [[ $OPT_TRAFFIC = all ]]
     then traffics="flood 50 oneatatime"
     else traffics=$OPT_TRAFFIC
     fi
+    for hostkvers in $host_kernel_versions; do
     for OPT_TRAFFIC in $traffics; do
     for kvers in $kernel_versions; do
-	dir=$(create_dirs $kvers $OPT_TRAFFIC $(basename $0 .sh))
+	dir="results/$hostkvers/$kvers/$OPT_TRAFFIC/$(basename $0 .sh)"
+	mkdir -p $dir
 	script=$PWD/$0
 	cd $dir
 	echo "Working directory: $dir"
 	if [[ ! "$OPT_PLOT_ONLY" ]]; then
 	    # Remove data from the last measurement
 	    rm -rf *
+	    touch .results
 	    # 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'
+ 	    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'
+ 	    sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
 	    # Reset priorities
-	    sshgw 'chrt -p -f 50 `pidof irq/145-can0` > /dev/null || :'
-	    sshgw 'chrt -p -f 50 `pidof irq/146-can1` > /dev/null || :'
-	    sshgw 'chrt -p -f 49 `pidof sirq-net-rx/0` > /dev/null || :'
-	    sshgw 'chrt -p -f 49 `pidof sirq-net-tx/0` > /dev/null || :'
-	    cleanupgw
+	    sshgw 'if pid=`pidof irq/145-can0`; then chrt -p -f 50 $pid > /dev/null; fi'
+	    sshgw 'if pid=`pidof irq/146-can1`; then chrt -p -f 50 $pid > /dev/null; fi'
+	    sshgw 'if pid=`pidof sirq-net-rx/0`; then chrt -p -f 49 $pid > /dev/null; fi'
+	    sshgw 'if pid=`pidof sirq-net-tx/0`; then chrt -p -f 49 $pid > /dev/null; fi'
+	    # Set the length of qdisc queue to avoid ENOBUFS errors
+	    ifconfig can0 txqueuelen 200
+ 	    cleanupgw
 
 	    main
 	    cp $script .
@@ -125,6 +124,7 @@ _run() {
 	cd -
     done
     done
+    done
 }
 
 test_end() {