X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/b6a48d7f59692de4091ddd8447a6642f9008a271..2807b30a7f0a05c6c472346b8a1e925c26c46961:/gw-tests/nop.sh

diff --git a/gw-tests/nop.sh b/gw-tests/nop.sh
index f5804e6..bf51279 100755
--- a/gw-tests/nop.sh
+++ b/gw-tests/nop.sh
@@ -4,24 +4,32 @@
 
 main() {
     sshgw cangw -A -s can0 -d can1
-    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -h hist2.dat -f time2.dat
-    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 4) -h hist4.dat -f time4.dat
-    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 6) -h hist6.dat -f time6.dat
-    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 8) -h hist8.dat -f time8.dat
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n len2
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 4) -n len4
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 6) -n len6
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 8) -n len8
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+	range=0.06:0.4
+	echo "set logscale y"
+    else
+	range=0.05:100
+	echo "set logscale xy"
+    fi
     cat <<EOF
-set title "Single GW job for all messages, no modifications"
-set logscale y
-set grid
-set xlabel "Time [{/Symbol m}s]"
+set title "Single GW rule for all messages, no modifications"
+set grid xtics mxtics ytics mytics lw 1, lw 0.5
+set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:600] [1:$COUNT] \
-          "hist2.dat" with lp lt 1 title "2 byte messages", \
-          "hist4.dat" with lp lt 2 title "4 byte messages", \
-          "hist6.dat" with lp lt 3 title "6 byte messages", \
-          "hist8.dat" with lp lt 4 title "8 byte messages"
+plot [$range] [1:$COUNT] \
+          "len2-hist.txt" with lp lt 1 title "2 byte messages", \
+          "len4-hist.txt" with lp lt 2 title "4 byte messages", \
+          "len6-hist.txt" with lp lt 3 title "6 byte messages", \
+          "len8-hist.txt" with lp lt 4 title "8 byte messages"
 EOF
 }