X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/87bc08150624a9c9fb22addc10cfc1c5bad06991..e3e90bc84127a14b7de6a827c087a1c51da70bdc:/gw-tests/filter.sh

diff --git a/gw-tests/filter.sh b/gw-tests/filter.sh
index 5810dc5..0aa76c9 100755
--- a/gw-tests/filter.sh
+++ b/gw-tests/filter.sh
@@ -4,25 +4,39 @@
 
 ids="0 $(seq 255 256 2047)"
 
-main() {
+prepare() {
     sshgw 'for i in `seq 0 2047`; do cangw -A -s can0 -d can1 -f $(printf %x $i):7ff; done'
+}
+
+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 != oneatatime ]; then echo "Skipping eth test"; SKIPPED=1; return; fi
+
     for i in $ids; do
-	latester -d can0 -d can1 -d can2 -c $COUNT -i $i $(traffic_and_length 2) -h hist-$i.dat -f time-$i.dat
+	latester -d can0 -d can1 -d can2 -c $COUNT -i $i $(traffic_and_length 2) -n id-$i
     done
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+	range=0:0.8
+	echo "set logscale y"
+    else
+	range=0.01:100
+	echo "set logscale xy"
+    fi
     cat <<EOF
-set title "Single GW, no modifications, 2048 filters (one per id, mask 0x7FF)"
-set logscale y
-set grid
-set xlabel "Time [{/Symbol m}s]"
-set ylabel "Latency profile [messages]"
-plot [0:1500] [1:$COUNT] \\
+set title "2048 GW rules (one per id, mask 0x7FF), 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] \\
 EOF
     lt=1
     for i in $ids; do
-	echo_plot "\"hist-$i.dat\" with lp lt $lt title \"Message id $i\""
+	echo_plot "\"id-$i-hist.txt\" with lp lt $lt title \"Message id $i\""
         lt=$((lt+1))
     done
 }