Minor fixes and additional graphs

diff --git a/gw-tests/filter-time.sh b/gw-tests/filter-time.sh
index e82803a5f03b0cd3814d2073e88b373d8ed2898c..cbee7ee9c179ffaf3dae737c563c52852896843c 100755 (executable)
--- a/gw-tests/filter-time.sh
+++ b/gw-tests/filter-time.sh
@@ -21,7 +21,7 @@ plot_cmds() {
     fi
     min=$(head -n 1 id-0-msgs.txt | awk '{ print $2 }')
     cat <<EOF
-set title "Single GW job for all messages, no modifications"
+set title "2048 GW jobs (one per id, mask 0x7FF), no modifications"
 set grid xtics ytics mytics lw 1, lw 0.5
 set xlabel "Time [s]"
 set ylabel "Latency [ms]"

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 94ca00ef4f09ebf5c39b2b1136f5d81d98f949a5..23980263dfdd9504d0d1c1e67f71eece49b80883 100755 (executable)
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -215,6 +215,7 @@ class Test(object):
         additionalImgs = glob.glob("graph?*.png")
         if additionalImgs: print >>html, "<h3>Additional graphs</h3>"
         for i in additionalImgs:
+            print >>html, "<h4>%s</h4>" % i[5:-4]
             print >>html, self.fullImgLink(i)
         os.chdir(cwd)
         

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index fc12adea2c2dbd639b48f23aadf6919a4251ea81..5afc021109a9d8c1559678d739fef95a83ebfe19 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -51,7 +51,7 @@ _plot() {
     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 return; fi
+       if [[ ! -s plot.gp ]]; then continue; fi
        if [ -z "$OPT_NO_X11" ]; then
            echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
        fi
@@ -66,7 +66,6 @@ _plot() {
 #     echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \
 #      "$(< plot.gp)" | gnuplot > thumb/${testname}$i.png
     done
-
 }
 
 echo_plot() {

diff --git a/gw-tests/mod.sh b/gw-tests/mod.sh
index 0a338d691c0ff7455f2c2ace438df6a057bd47a2..53d0116be5a0b56368a2e59beb793384c38b4843 100755 (executable)
--- a/gw-tests/mod.sh
+++ b/gw-tests/mod.sh
@@ -37,14 +37,23 @@ main() {
     latester $LATESTER_OPTS -n modcscrc8
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+       range=0.14:0.2
+       echo "set logscale y"
+       echo "set key left bottom reverse Left"
+    else
+       range=0.05:100
+       echo "set logscale xy"
+    fi
     cat <<EOF
 set title "Single GW job for all messages with modifications, 8 byte messages"
-set logscale xy
 set grid xtics mxtics ytics mytics lw 1, lw 0.5
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0.05:100] [1:$COUNT] \
+plot [$range] [1:$COUNT] \
           "nop-hist.txt" with lp lt 1 title "No modifications", \
           "mod-hist.txt" with lp lt 2 title "Two modifications", \
           "mod2-hist.txt" with lp lt 3 title "Four modifications", \

diff --git a/gw-tests/nop.sh b/gw-tests/nop.sh
index 4a01e68631c40cc71f50fa0ad3eb06e24922b2fb..eed849bf58833ae9f0ab143c76748ea49837b980 100755 (executable)
--- a/gw-tests/nop.sh
+++ b/gw-tests/nop.sh
@@ -14,7 +14,7 @@ ADDITIONAL_PLOTS=detail
 
 plot_cmds() {
     if [[ "$1" = detail ]]; then
-       range=0.06:0.3
+       range=0.06:0.4
        echo "set logscale y"
     else
        range=0.05:100

diff --git a/gw-tests/user.sh b/gw-tests/user.sh
index b6f1be280f5cf3efb198afb2048ce844e66bac31..2e7b5bf33f09a3ce176e340ba9d94f080726ba87 100755 (executable)
--- a/gw-tests/user.sh
+++ b/gw-tests/user.sh
@@ -12,18 +12,28 @@ main() {
     latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 8) -n kern8
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+       [[ $traffic = eth ]] && return
+       range=0.05:0.5
+       echo "set logscale y"
+       echo "set mxtics 5"
+    else
+       range=0.05:1000
+       echo "set logscale xy"
+    fi
     cat <<EOF
 set title "Kernel vs. userspace GW, no modifications"
-set logscale xy
 set grid xtics mxtics ytics mytics lw 1, lw 0.5
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0.05:1000] [1:$COUNT] \
-          "kern2-hist.txt" with lp lt 1 title "Kernel GW, 2 byte messages", \
-          "kern8-hist.txt" with lp lt 2 title "Kernel GW, 8 byte messages", \
+plot [$range] [1:$COUNT] \
           "user2-hist.txt" with lp lt 1 title "Userspace GW, 2 byte messages", \
-          "user8-hist.txt" with lp lt 2 title "Userspace GW, 8 byte messages"
+          "user8-hist.txt" with lp lt 2 title "Userspace GW, 8 byte messages", \
+          "kern2-hist.txt" with lp lt 1 title "Kernel GW, 2 byte messages", \
+          "kern8-hist.txt" with lp lt 2 title "Kernel GW, 8 byte messages"
 EOF
 }
     

diff --git a/gw-tests/vcan.sh b/gw-tests/vcan.sh
index d9a8fecbc765c2798991a9fc69ab7c428d9894d6..502190f75deba893e16d75953d0a26ebac45ae5a 100755 (executable)
--- a/gw-tests/vcan.sh
+++ b/gw-tests/vcan.sh
@@ -19,14 +19,23 @@ main() {
     sshgw ip link del dev vcan0
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+       range=0.1:0.4
+       echo "set logscale y"
+       echo "set mxtics "
+    else
+       range=0.1:1000
+       echo "set logscale xy"
+    fi
     cat <<EOF
 set title "Chained GW jobs on a signle VCAN interface"
-set logscale xy
 set grid xtics mxtics ytics mytics lw 1, lw 0.5
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0.1:1000] [1:$COUNT] \\
+plot [$range] [1:$COUNT] \\
 EOF
     lt=2
     for i in $numjobs; do

diff --git a/gw-tests/vcans.sh b/gw-tests/vcans.sh
index be2ec2d7916b3e5b37c1b70c82c40aa92f830608..6bd57cbd566352c7b4844ba5daea8ec77df6a42c 100755 (executable)
--- a/gw-tests/vcans.sh
+++ b/gw-tests/vcans.sh
@@ -19,14 +19,23 @@ main() {
     done
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+       range=0.1:0.4
+       echo "set logscale y"
+       echo "set mxtics 5"
+    else
+       range=0.1:1000
+       echo "set logscale xy"
+    fi
     cat <<EOF
 set title "Chained GW jobs on multiple VCAN interfaces"
-set logscale xy
 set grid xtics mxtics ytics mytics lw 1, lw 0.5
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0.1:1000] [1:$COUNT] \\
+plot [$range] [1:$COUNT] \\
 EOF
     lt=1
     for i in $numjobs; do