X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/9ad2ddd1c2c96f1afa1ad0870b1e40ab81fd363d..f32de48759fc2e9ffceb6c667e62967073ef27e1:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index da31988..f6f4439 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
@@ -11,14 +12,19 @@ error() {
 
 while [ $# -gt 0 ]; do
     case "$1" in
-	-P) OPT_PLOT_DISABLE=1; shift;;
-	-p) OPT_PLOT_ONLY=1; shift;;
+	-P|--no-plot) OPT_PLOT_DISABLE=1; shift;;
+	-p|--plot) OPT_PLOT_ONLY=1; shift;;
 	-X|--no-x11-plot) OPT_NO_X11=1; shift;;
 	-t) case "$2" in
 		all|flood|50|oneatatime) OPT_TRAFFIC=$2;;
 		*) 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($kvers)\"/" > plot.gp
+    plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (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 solid color enhanced; set output \"${testname}$I.pdf\";" \
+	"$(< plot.gp)" | gnuplot
+    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 -resize 150x105 -gamma 0.5 -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
 
 }
 
@@ -69,54 +73,102 @@ echo_plot() {
 
 traffic_and_length() {
     local opts
-    case $OPT_TRAFFIC in
+    case $traffic in
 	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 *
+    # 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
+    sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
+    # Reset priorities
+    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
+    ifconfig can1 txqueuelen 200
+    cleanupgw
+
+    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
+}
+
+
 _run() {
-    if [[ ! "$OPT_PLOT_ONLY" ]]
-    then kernel_versions=$(sshgw uname -r)
-    else kernel_versions= # TODO $(ls results/by-kern)
-    fi
     if [[ $OPT_TRAFFIC = all ]]
     then traffics="flood 50 oneatatime"
-    else traffics=$OPT_TRAFFIC
+    else traffics=${traffic:-$OPT_TRAFFIC}
+    fi
+    if [[ $OPT_LOAD = all ]]
+    then loads="none cpu eth" # TODO: can
+    else loads=${load:-$OPT_LOAD}
     fi
-    for OPT_TRAFFIC in $traffics; do
-    for kvers in $kernel_versions; do
-	dir="results/host-$(uname -r)/$kvers/$OPT_TRAFFIC/$(basename $0 .sh)"
+    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/$load/$test"
 	mkdir -p $dir
-	script=$PWD/$0
+	script=$(echo $dir | sed -e 's/[^/]*/../g')/${test}.sh
 	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'
-	    # Reset priorities
-	    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 .
+	    echo "Working directory: $dir"
+	    _measure
 	fi
 	if [[ ! "$OPT_PLOT_DISABLE" ]]; then
 	    _plot
 	fi
-	cd -
+	cd - > /dev/null
     done
     done
 }