Fix generation of pdf graphs

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index d176f226b027feeb1e1d88ad08e43d504c87ce99..f6f4439b656e5e58adfa24c4bc4ab81d3a47ca4f 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -35,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 "$@"
 }
@@ -49,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{\/*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
 
 }
 
@@ -107,17 +105,6 @@ kill_load() {
 _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
-       export load=$load
-       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 || :
@@ -140,6 +127,19 @@ _measure() {
     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
 }