X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/ee367e21f2ccb37e6593c2545658280ec815ca88..0067509575642daf871e95388be79ae95ad33d70:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 05b28d1..70f0132 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -3,6 +3,7 @@ set -e
 COUNT=10000
 
 OPT_TRAFFIC=oneatatime
+OPT_LOAD=none
 
 error() {
     echo $1 >&2
@@ -19,6 +20,11 @@ while [ $# -gt 0 ]; do
 		*) error "Unknown traffic specification: $2";;
     	    esac;
     	    shift 2;;
+	-l) case "$2" in
+		all|none|cpu|eth|can) OPT_LOAD=$2;;
+		*) error "Unknown load specification: $2";;
+	    esac;
+	    shift 2;;
     esac
 done
 
@@ -29,9 +35,7 @@ sshgw() {
 
     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)
-	ssh -f -M -S $socket root@192.168.2.3 sleep 600 > /dev/null 2>&1
+	ssh -N -f -M -S $socket root@192.168.2.3 >/dev/null 2>&1
     fi
     ssh -x -a -S $socket root@192.168.2.3 "$@"
 }
@@ -43,20 +47,20 @@ cleanupgw() {
 _plot() {
     local testname=`basename $0 .sh`
 
-    plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n(GW kernel $kvers, traffic $traffic)\"/" > plot.gp
+    plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n(GW kernel $kvers, Traffic $traffic, Load $load)\"/" > 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
     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
+    echo 'set terminal pdfcairo color enhanced;' \
+	"$(< plot.gp)" | gnuplot > ${testname}$I.pdf
+    echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \
+	"$(< plot.gp)" | gnuplot > ${testname}$I.png
     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
+    convert -size 150x105 -quality 90 -type Palette -depth 8 ${testname}$I.png thumb/${testname}$I.png
+#     echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \
+# 	"$(< plot.gp)" | gnuplot > thumb/${testname}$I.png
 
 }
 
@@ -73,30 +77,38 @@ traffic_and_length() {
 	flood) opts='';;
 	50) 	   opts="-p $((2*(44+$1*8)))";;
 	oneatatime) 	   opts="-o";;
-	*) error "Unknown traffic specification"
+	*) error "Unknown traffic specification: $traffic"
     esac
     echo $opts -l $1
 }
 
 start_load() {
+    case $load in
+	none) ;;
+	cpu) sshgw 'hackbench -g 3 -l 10000' & loadpid=$!;;
+	eth) ping -f -s 60000 -q 192.168.2.3 & loadpid=$!;; # TODO: Generate eth load from another computer
+	can) latester -q -d can1 -i 0x7ff & loadpid=$!;;
+	*) error "Unknown load specification: $load"
+    esac
 }
 
 kill_load() {
+    case $load in
+	none) ;;
+	cpu) kill $loadpid; sshgw "killall -q hackbench || :";;
+	eth) kill $loadpid;;
+	can) kill $loadpid;;
+	*) error "Unknown load specification: $load"
+    esac
 }
 
 _measure() {
     # Remove data from the last measurement
     rm -rf *
-    touch .results
-    cat > plot.sh <<-EOF
-	#!/bin/bash
-	export kvers=$kvers
-	export hostkvers=$hostkvers
-	export traffic=$traffic
-	cd \$(dirname \$0)/$(dirname $script)
-	exec ./$(basename $script) --plot "\$@"
-	EOF
-    chmod +x plot.sh
+    # Kill load generators left possibly from the past runs
+    killall -q ping || :
+    killall -q latester || :
+    sshgw 'killall -q hackbench || :'
     # 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
@@ -108,12 +120,26 @@ _measure() {
     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
+    ifconfig can1 txqueuelen 200
     cleanupgw
 
-    prepare
+    type prepare >/dev/null 2>&1 && prepare || :
     start_load
     main
     kill_load
+
+    # Create a plot script at the end to signalize that the
+    # measurement was successfully finished
+    cat > plot.sh <<-EOF
+	#!/bin/bash
+	export kvers=$kvers
+	export hostkvers=$hostkvers
+	export traffic=$traffic
+	export load=$load
+	cd \$(dirname \$0)/$(dirname $script)
+	exec ./$(basename $script) --plot "\$@"
+	EOF
+    chmod +x plot.sh
 }
 
 
@@ -122,11 +148,16 @@ _run() {
     then traffics="flood 50 oneatatime"
     else traffics=${traffic:-$OPT_TRAFFIC}
     fi
+    if [[ $OPT_LOAD = all ]]
+    then loads="none cpu eth" # TODO: can
+    else loads=${load:-$OPT_LOAD}
+    fi
     hostkvers=${hostkvers:-host-$(uname -r)}
     kvers=${kvers:-$(sshgw uname -r)}
     test=$(basename $0 .sh)
+    for load in $loads; do
     for traffic in $traffics; do
-	dir="results/$hostkvers/$kvers/$traffic/$test"
+	dir="results/$hostkvers/$kvers/$traffic/$load/$test"
 	mkdir -p $dir
 	script=$(echo $dir | sed -e 's/[^/]*/../g')/${test}.sh
 	cd $dir
@@ -139,6 +170,7 @@ _run() {
 	fi
 	cd - > /dev/null
     done
+    done
 }
 
 test_end() {