From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 30 Nov 2010 23:04:54 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
X-Git-Tag: fix-allnoconfig~296
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/70ab712fc0b79630fb89ed38713b7b03519e9226?hp=9d75af512277c5864ee9e55534b9fdc2474b5484

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

diff --git a/gw-tests/gw-filter-sff.sh b/gw-tests/gw-filter-sff.sh
new file mode 100755
index 0000000..5338376
--- /dev/null
+++ b/gw-tests/gw-filter-sff.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. lib.sh
+
+ids=$(seq 0 256 2047)
+
+main() {
+    sshgw 'for i in `seq 0 2047`; do cangw -A -s can0 -d can1 -f $(printf %x $i):c00007ff; 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
+}
+
+plot_cmds() {
+    cat <<EOF
+set title "Single GW, no modifications, 2048 filters (one per id)"
+set logscale y
+set grid
+set xlabel "Time [{/Symbol m}s]"
+set ylabel "Latency profile [messages]"
+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\"
+        lt=$((lt+1))
+    done
+    echo
+}
+    
+test_end
diff --git a/gw-tests/gw-filter.sh b/gw-tests/gw-filter.sh
index b2be4e8..bebdc3f 100755
--- 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,12 +13,12 @@ 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