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

diff --git a/gw-tests/filter.sh b/gw-tests/filter.sh
index 183ab1b..b62fc9d 100755
--- a/gw-tests/filter.sh
+++ b/gw-tests/filter.sh
@@ -4,25 +4,36 @@
 
 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() {
     for i in $ids; do
-	latester -d can0 -d can1 -d can2 -o -c $COUNT -i $i -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.36:0.8
+	echo "set logscale y"
+    else
+	range=0.05: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 title "2048 GW rules (one per id, mask 0x7FF), no modifications"
+set grid xtics mxtics ytics mytics lw 1, lw 0.5
+set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:1500] [1:$COUNT] \\
+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
 }