X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/0067509575642daf871e95388be79ae95ad33d70..b0d0a09235093cf11fbe83ce502d7079bc255f7e:/gw-tests/lib.sh diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh index 70f0132..8cfcf26 100644 --- a/gw-tests/lib.sh +++ b/gw-tests/lib.sh @@ -33,6 +33,12 @@ PATH=$PWD/../_compiled/bin/:$PATH sshgw() { local socket="$HOME/.ssh/cangw-connection" + if [[ "$1" = "-f" ]]; then + shift + else + if [[ "$NO_GW_NEEDED" ]]; then return; fi + fi + if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then # Create master connection to speed up subsequenct command. ssh -N -f -M -S $socket root@192.168.2.3 >/dev/null 2>&1 @@ -46,22 +52,24 @@ cleanupgw() { _plot() { local testname=`basename $0 .sh` - - 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 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 -size 150x105 -quality 90 -type Palette -depth 8 ${testname}$I.png thumb/${testname}$I.png + rm -rf *.pdf *.png + for i in "" $ADDITIONAL_PLOTS; do + plot_cmds $i | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot.gp + if [[ ! -s plot.gp ]]; then continue; fi + if [ -z "$OPT_NO_X11" ]; then + echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist + fi + test "$(gnuplot --version)" = "gnuplot 4.2 patchlevel 5 " && continue + echo "set terminal pdfcairo solid color enhanced; " \ + "set output \"graph$i.pdf\";" \ + "set pointsize 0.5;" \ + "$(< plot.gp)" | gnuplot + echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \ + "$(< plot.gp)" | gnuplot > graph$i.png + convert -resize 150x105 -gamma 0.5 -quality 90 -type Palette -depth 8 graph$i.png tgraph$i.png # echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \ -# "$(< plot.gp)" | gnuplot > thumb/${testname}$I.png - +# "$(< plot.gp)" | gnuplot > thumb/${testname}$i.png + done } echo_plot() { @@ -83,9 +91,10 @@ traffic_and_length() { } start_load() { + unset LATESTER_CONTROL_HACKBENCH case $load in none) ;; - cpu) sshgw 'hackbench -g 3 -l 10000' & loadpid=$!;; + cpu) export LATESTER_CONTROL_HACKBENCH=$(sshgw 'nohup setpgid hackbench -g 3 -l 100000 >/dev/null & echo $!');; 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" @@ -95,7 +104,7 @@ start_load() { kill_load() { case $load in none) ;; - cpu) kill $loadpid; sshgw "killall -q hackbench || :";; + cpu) sshgw "kill -9 -$LATESTER_CONTROL_HACKBENCH; killall -q -9 hackbench || :";; eth) kill $loadpid;; can) kill $loadpid;; *) error "Unknown load specification: $load" @@ -108,29 +117,37 @@ _measure() { # 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 + if [[ ! "$NO_GW_NEEDED" ]]; then + 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 + sshgw 'ifconfig can0 txqueuelen 1000; ifconfig can1 txqueuelen 1000' + ifconfig can0 txqueuelen 200 + ifconfig can1 txqueuelen 200 + cleanupgw + + type prepare >/dev/null 2>&1 && prepare || : + start_load + fi + main - kill_load - # Create a plot script at the end to signalize that the - # measurement was successfully finished - cat > plot.sh <<-EOF + if [[ ! "$NO_GW_NEEDED" ]]; then + kill_load + fi + + if [ ! "$SKIPPED" ]; then + # 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 @@ -139,7 +156,8 @@ _measure() { cd \$(dirname \$0)/$(dirname $script) exec ./$(basename $script) --plot "\$@" EOF - chmod +x plot.sh + chmod +x plot.sh + fi } @@ -153,7 +171,7 @@ _run() { else loads=${load:-$OPT_LOAD} fi hostkvers=${hostkvers:-host-$(uname -r)} - kvers=${kvers:-$(sshgw uname -r)} + kvers=${kvers:-$(sshgw -f uname -r)} test=$(basename $0 .sh) for load in $loads; do for traffic in $traffics; do