Update ranges of graphs - to take into account substraction of tx time

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

diff --git a/gw-tests/user.sh b/gw-tests/user.sh
index b6f1be280f5cf3efb198afb2048ce844e66bac31..45e57ae5de6c293b88626664b2972ce680b2ec3d 100755 (executable)
--- a/gw-tests/user.sh
+++ b/gw-tests/user.sh
@@ -3,6 +3,7 @@
 . lib.sh
 
 main() {
+    if [ "$kvers" = 3.0.4-rt14-00008-gb2052fd -a "$load" = eth -a $traffic != oneatatime ]; then echo "Skipping eth test"; SKIPPED=1; return; fi
     pid=$(sshgw 'chrt -f 90 candump -s2 -b can1 can0 & echo $!')
     latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n user2
     latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 8) -n user8
@@ -12,18 +13,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
 }