Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

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

diff --git a/gw-tests/gw-filter.sh b/gw-tests/gw-filter.sh
index b2be4e88f5b5baa4cd6d133c56631ceb45b1fc54..757f328107ef1436c048f31fcb8e6711a08b07a1 100755 (executable)
--- a/gw-tests/gw-filter.sh
+++ b/gw-tests/gw-filter.sh
@@ -2,10 +2,10 @@
 
 . lib.sh
 
-ids=$(seq 0 512 4095)
+ids=$(seq 0 256 2047)
 
 main() {
-    sshgw 'for i in `seq 0 4095`; do cangw -A -s can0 -d can1 -f $(printf %x $i):fff; done'
+    sshgw 'for i in `seq 0 2047`; do cangw -A -s can0 -d can1 -f $(printf %x $i):7ff; done'
     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
     done
@@ -13,20 +13,18 @@ main() {
 
 plot_cmds() {
     cat <<EOF
-set title "Single GW, no modifications, 4095 filters (one per id)"
+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:2000] [1:$COUNT] \\
+plot [0:1500] [1:$COUNT] \\
 EOF
     lt=1
     for i in $ids; do
-       (( i != 0)) && echo ", \\"
-       echo -n "    " \"hist-$i.dat\" with lp lt $lt title \"Message id $i\"
+       echo_plot "\"hist-$i.dat\" with lp lt $lt title \"Message id $i\""
         lt=$((lt+1))
     done
-    echo
 }
     
 test_end