Plot graphs with cairo - it is faster and nicer

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

diff --git a/gw-tests/user.sh b/gw-tests/user.sh
index 1edfa7438dd15b55ca0aa37a1c137a3bc90dc325..18e673088317a08f5e2d2aae280f611903b75e26 100755 (executable)
--- a/gw-tests/user.sh
+++ b/gw-tests/user.sh
@@ -4,26 +4,26 @@
 
 main() {
     pid=$(sshgw 'chrt -f 90 candump -s2 -b can1 can0 & echo $!')
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 2 -h uhist2.dat -f utime2.dat
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 8 -h uhist8.dat -f utime8.dat
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n user2
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 8) -n user8
     sshgw kill $pid
     sshgw cangw -A -s can0 -d can1
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 2 -h khist2.dat -f ktime2.dat
-    latester -d can0 -d can1 -d can2 -o -c $COUNT -l 8 -h khist8.dat -f ktime8.dat
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n kern2
+    latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 8) -n kern8
 }
 
 plot_cmds() {
     cat <<EOF
-set title "Kernel vs. userspace GW, no modifications, no filters"
+set title "Kernel vs. userspace GW, no modifications"
 set logscale y
 set grid
-set xlabel "Time [{/Symbol m}s]"
+set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
 plot [0:] [1:$COUNT] \
-          "khist2.dat" with lp lt 1 title "Kernel GW, 2 byte messages", \
-          "khist8.dat" with lp lt 2 title "Kernel GW, 8 byte messages", \
-          "uhist2.dat" with lp lt 1 title "Userspace GW, 2 byte messages", \
-          "uhist8.dat" with lp lt 2 title "Userspace GW, 8 byte messages"
+          "kern2-hist.txt" with lp lt 1 title "Kernel GW, 2 byte messages", \
+          "kern8-hist.txt" with lp lt 2 title "Kernel GW, 8 byte messages", \
+          "user2-hist.txt" with lp lt 1 title "Userspace GW, 2 byte messages", \
+          "user8-hist.txt" with lp lt 2 title "Userspace GW, 8 byte messages"
 EOF
 }