X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/67617ebf00d594ee3c932b6c8e1850265f28adee..70f20384be7027a88e5ad56bc47324d78f859980:/gw-tests/nop-highprio.sh

diff --git a/gw-tests/nop-highprio.sh b/gw-tests/nop-highprio.sh
index 8363fd5..085645a 100755
--- a/gw-tests/nop-highprio.sh
+++ b/gw-tests/nop-highprio.sh
@@ -3,9 +3,18 @@
 . lib.sh
 
 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;
+
     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'
+
+    # Unfortunately, we must also increase FEC (Ethernet) IRQ priority
+    # to be above softirq. Otherwise the system crashes with eth load.
+    sshgw 'if pid=`pidof irq/192-mpc52xx`; then chrt -p -f 99 $pid; fi'
+    sshgw 'if pid=`pidof irq/193-mpc52xx`; then chrt -p -f 99 $pid; fi'
+
     sshgw 'if pid=`pidof sirq-net-rx/0`; then chrt -p -f 98 $pid; fi'
     sshgw 'if pid=`pidof sirq-net-tx/0`; then chrt -p -f 98 $pid; fi'
     latester -d can0 -d can1 -d can2 -c $COUNT $(traffic_and_length 2) -n len2
@@ -14,17 +23,25 @@ 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 job for all messages, no modifications, high (soft)irq task priority"
-set logscale y
-set grid
-set xlabel "Time [ms]"
-set ylabel "Latency profile [messages]"
-plot [0:600] [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", \
+set title "Single GW rule for all messages, no modifications, high (soft)irq task priority"
+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] \\
+          "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
 }