From e027d3bf8362f509047541450650a93c7d0c5ea7 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sun, 12 Dec 2010 23:28:21 +0100
Subject: [PATCH] Minor fixes and additional graphs

---
 gw-tests/filter-time.sh     |  2 +-
 gw-tests/genhtml/genhtml.py |  1 +
 gw-tests/lib.sh             |  3 +--
 gw-tests/mod.sh             | 13 +++++++++++--
 gw-tests/nop.sh             |  2 +-
 gw-tests/user.sh            | 20 +++++++++++++++-----
 gw-tests/vcan.sh            | 13 +++++++++++--
 gw-tests/vcans.sh           | 13 +++++++++++--
 8 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/gw-tests/filter-time.sh b/gw-tests/filter-time.sh
index e82803a..cbee7ee 100755
--- 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 94ca00e..2398026 100755
--- 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 fc12ade..5afc021 100644
--- 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 0a338d6..53d0116 100755
--- 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 4a01e68..eed849b 100755
--- 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 b6f1be2..2e7b5bf 100755
--- 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 d9a8fec..502190f 100755
--- 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 be2ec2d..6bd57cb 100755
--- 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
-- 
2.39.2