X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/20b3deb1d2a53e85261e1db2d30ff1a7140be018..HEAD:/gw-tests/vcan.sh

diff --git a/gw-tests/vcan.sh b/gw-tests/vcan.sh
index 7d01e82..3f002fc 100755
--- a/gw-tests/vcan.sh
+++ b/gw-tests/vcan.sh
@@ -5,6 +5,10 @@
 numjobs=`seq 0 2 10`
 
 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 ]; then echo "Skipping test"; SKIPPED=1; return; fi; #All frames of these tests are returned as invalid...
+
     sshgw 'ip link add dev vcan0 type vcan && ip link set vcan0 up'
     for i in $numjobs; do
 	cleanupgw
@@ -14,23 +18,32 @@ main() {
 	done
 	sshgw cangw -A -s vcan0 -d can1 -f $(printf %x:C00007FF $i)
 
-	latester -d can0 -d can1 -d can2 -o -c $COUNT -i 0 -h hist-$i.dat -f time-$i.dat
+	latester -d can0 -d can1 -d can2 -c $COUNT -i 0 $(traffic_and_length 2) -n hops$i
     done
     sshgw ip link del dev vcan0
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+	range=0:0.4
+	echo "set logscale y"
+	echo "set mxtics 5"
+    else
+	range=0.01:1000
+	echo "set logscale xy"
+    fi
     cat <<EOF
-set title "Chained GWs on a signle VCAN interface"
-set logscale y
-set grid
-set xlabel "Time [{/Symbol m}s]"
-set ylabel "Latency profile [messages]"
-plot [0:1000] [1:$COUNT] \\
+set title "Chained GWs on a single VCAN interface"
+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] \\
 EOF
-    lt=1
+    lt=2
     for i in $numjobs; do
-	echo_plot "\"hist-$i.dat\" with lp lt $lt title \"$i GW jobs on vcan\""
+	echo_plot "\"hops$i-hist.txt\" with lp lt $lt pt $lt title \"$((i+2)) GW jobs, 1 vcan\""
         lt=$((lt+1))
     done
 }