Commit fixing that threads not cleaning up after themselves.

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

diff --git a/gw-tests/vcans.sh b/gw-tests/vcans.sh
index 6c3cada2f0d58fe4125e603b985820cf7012a0ac..65fc5b8e4c1e328a6ec0493de2330e63cb5760b1 100755 (executable)
--- a/gw-tests/vcans.sh
+++ b/gw-tests/vcans.sh
@@ -5,6 +5,7 @@
 numjobs=" 1 `seq 2 2 10`"
 
 main() {
+    if [ "$kvers" = 3.0.4-rt14-00008-gb2052fd -a "$load" = eth -a $traffic != oneatatime ]; then echo "Skipping eth test"; SKIPPED=1; return; fi
     for i in $numjobs; do
        cleanupgw
        lastif=can0
@@ -15,22 +16,31 @@ main() {
        done
        sshgw cangw -A -s $lastif -d can1 -f $(printf %x:C00007FF $((i-1)))
 
-       latester -d can0 -d can1 -d can2 -o -c $COUNT -i 0 -h hist-$i.dat -f time-$i.dat
+       latester -d can0 -d can1 -d can2 -c $COUNT -i 0 $(traffic_and_length 2) -n hops$i
     done
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+       range=0:0.4
+       echo "set logscale y"
+       echo "set mxtics 5"
+    else
+       range=0.01:1000
+       echo "set logscale xy"
+    fi
     cat <<EOF
 set title "Chained GWs on multiple VCAN interfaces"
-set logscale y
-set grid
-set xlabel "Time [{/Symbol m}s]"
-set ylabel "Latency profile [messages]"
-plot [0:1000] [1:$COUNT] \\
+set grid xtics mxtics ytics mytics lw 1, lw 0.5
+set xlabel "GW latency [ms]"
+set ylabel "Latency profile [frames]"
+plot [$range] [1:$COUNT] \\
 EOF
     lt=1
     for i in $numjobs; do
-       echo_plot "\"hist-$i.dat\" with lp lt $lt title \"$i GW jobs, $((i-1)) vcans\""
+       echo_plot "\"hops$i-hist.txt\" with lp lt $lt title \"$i GW jobs, $((i-1)) vcans\""
         lt=$((lt+1))
     done
 }