X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/46501dba4480f0dbb96b994246442c11fdd6e58e..02514b395a2fec49eb4f6a23c7f46e87f07f9fb3:/gw-tests/user.sh

diff --git a/gw-tests/user.sh b/gw-tests/user.sh
index 1edfa74..183ebd9 100755
--- a/gw-tests/user.sh
+++ b/gw-tests/user.sh
@@ -3,27 +3,44 @@
 . 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
+    if [ "$kvers" = 3.4.33-rt47-00004-gc58c9ae -a "$load" = eth -a $traffic != oneattime ]; 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 -o -c $COUNT -l 2 -h uhist2.dat -f utime2.dat
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 8 -h uhist8.dat -f utime8.dat
+    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
     sshgw kill $pid
     sshgw cangw -A -s can0 -d can1
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 2 -h khist2.dat -f ktime2.dat
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 8 -h khist8.dat -f ktime8.dat
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n kern2
+    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.0:0.5
+	echo "set logscale y"
+	echo "set mxtics 5"
+    else
+	range=0.01:1000
+	echo "set logscale xy"
+    fi
     cat <<EOF
-set title "Kernel vs. userspace GW, no modifications, no filters"
-set logscale y
-set grid
-set xlabel "Time [{/Symbol m}s]"
-set ylabel "Latency profile [messages]"
-plot [0:] [1:$COUNT] \
-          "khist2.dat" with lp lt 1 title "Kernel GW, 2 byte messages", \
-          "khist8.dat" with lp lt 2 title "Kernel GW, 8 byte messages", \
-          "uhist2.dat" with lp lt 1 title "Userspace GW, 2 byte messages", \
-          "uhist8.dat" with lp lt 2 title "Userspace GW, 8 byte messages"
+set termoption dashed
+set style line 1 lt 1 lc 1 pt 1
+set style line 2 lt 2 lc 1 pt 1
+set style line 3 lt 1 lc 2 pt 2
+set style line 4 lt 2 lc 2 pt 2
+set title "Kernel vs. userspace GW, no modifications"
+set grid xtics mxtics ytics mytics lw 1, lw 0.5
+set xlabel "GW latency [ms]"
+set ylabel "Latency profile [frames]"
+plot [$range] [1:$COUNT] \\
+          "user2-hist.txt" with lp ls 1 title "Userspace GW, 2 byte messages", \\
+          "user8-hist.txt" with lp ls 2 title "Userspace GW, 8 byte messages", \\
+          "kern2-hist.txt" with lp ls 3 title "Kernel GW, 2 byte messages", \\
+          "kern8-hist.txt" with lp ls 4 title "Kernel GW, 8 byte messages"
 EOF
 }