No not plot so many jobs

[can-benchmark.git] / gw-tests / lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 739333c2227e353b387d5e01fb51e0a8e902a526..8cf99e98d7ae52b54d9630daa62adb10423ebec5 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -33,6 +33,8 @@ PATH=$PWD/../_compiled/bin/:$PATH
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
+    if [[ "$NO_GW_NEEDED" ]]; then return; 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 +48,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 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
-    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
-
+    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
+    done
 }
 
 echo_plot() {
@@ -105,7 +109,37 @@ kill_load() {
 _measure() {
     # Remove data from the last measurement
     rm -rf *
-    touch .results
+    # Kill load generators left possibly from the past runs
+    killall -q ping || :
+    killall -q latester || :
+    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
+       ifconfig can0 txqueuelen 200
+       ifconfig can1 txqueuelen 200
+       cleanupgw
+
+       type prepare >/dev/null 2>&1 && prepare || :
+       start_load
+    fi
+
+    main
+
+    if [[ ! "$NO_GW_NEEDED" ]]; then
+       kill_load
+    fi
+
+    # Create a plot script at the end to signalize that the
+    # measurement was successfully finished
     cat > plot.sh <<-EOF
        #!/bin/bash
        export kvers=$kvers
@@ -116,28 +150,6 @@ _measure() {
        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
-    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
 }