Modified nop-highprio tests to have plot level "detail".

Changed according to the nop tests, there is no reason they should not have them.

diff --git a/gw-tests/nop-highprio-time.sh b/gw-tests/nop-highprio-time.sh
index 8faeeeebe02fc0b1bf70d7b7060f1bfd3d4a9dd6..3712cb7e2ea23ba09c37e5fa054c9d4f7a31e948 100755 (executable)
--- a/gw-tests/nop-highprio-time.sh
+++ b/gw-tests/nop-highprio-time.sh
@@ -12,7 +12,15 @@ main() {
     fi;
 }
 
+ADDITIONAL_PLOTS=detail
+
 plot_cmds() {
+    if [[ "$1" = detail ]]; then
+       range=0.0:0.3
+    else
+       range=0.01:4
+       echo "set logscale y"
+    fi
     min=$(head -n 1 len2-msgs.txt | awk '{ print $2 }')
     cat <<EOF
 set title "Single GW rule for all messages, no modifications, high (soft)irq task priority"
@@ -21,7 +29,7 @@ set grid xtics ytics mytics lw 1, lw 0.5
 set key left
 set xlabel "Experiment time [s]"
 set ylabel "GW latency [ms]"
-plot [:] [0.01:4] \\
+plot [:] [$range] \\
           "len2-msgs.txt" using (\$2-$min):(1000*\$14-0.001*\$16) with points title "2 byte messages", \\
           "len4-msgs.txt" using (\$2-$min):(1000*\$14-0.001*\$16) with points title "4 byte messages", \\
           "len6-msgs.txt" using (\$2-$min):(1000*\$14-0.001*\$16) with points title "6 byte messages", \\

diff --git a/gw-tests/nop-highprio.sh b/gw-tests/nop-highprio.sh
index b77db1e82b632342d3917ce037d7f4783b5438ac..3bc02b2493fb403d59a94d1644805d64df9b5826 100755 (executable)
--- a/gw-tests/nop-highprio.sh
+++ b/gw-tests/nop-highprio.sh
@@ -5,7 +5,7 @@
 main() {
     if [ "$kvers" = 3.0.4-rt14-00008-gb2052fd -a "$load" = eth ]; then echo "Skipping eth test"; SKIPPED=1; return; fi
     if [ "$kvers" = 3.4.33-rt47-00004-gc58c9ae -a "$load" = eth ]; then echo "Skipping eth test"; SKIPPED=1; return; fi;
-\r
+
     sshgw cangw -A -s can0 -d can1
     sshgw 'if pid=`pidof irq/145-can0`; then chrt -p -f 99 $pid; fi'
     sshgw 'if pid=`pidof irq/146-can1`; then chrt -p -f 99 $pid; fi'
@@ -23,14 +23,23 @@ main() {
     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.0:0.3
+       echo "set logscale y"
+    else
+       range=0.01:100
+       echo "set logscale xy"
+    fi
     cat <<EOF
 set title "Single GW rule for all messages, no modifications, high (soft)irq task priority"
 set logscale xy
 set grid xtics mxtics ytics mytics lw 1, lw 0.5
 set xlabel "GW latency [ms]"
 set ylabel "Latency profile [frames]"
-plot [0.01:100] [1:$COUNT] \\
+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", \\