Plot graphs with cairo - it is faster and nicer

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 739333c2227e353b387d5e01fb51e0a8e902a526..70f013212c281b18e1a92455263fbb81d13132fe 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -53,14 +53,14 @@ _plot() {
        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
 
 }
 
@@ -105,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 || :
@@ -138,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
 }