X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/79f8357de009a8b24c7060811846f124d9ddde6a..68ae17932b8f8b5cf4bb37158902185517d9546e:/tests/ethload.sh

diff --git a/tests/ethload.sh b/tests/ethload.sh
index a5e57f6..c584b94 100755
--- a/tests/ethload.sh
+++ b/tests/ethload.sh
@@ -6,25 +6,28 @@ t() {
     for i in norm boost; do
 	ssh root@${SSH_CONNECTION%% *} 'find -L /usr/src/linux -type f -exec cat "{}" ";"' > /dev/null &
 	PID_LOAD=$!
-	[ $i == "boost" ] && boost_irq_prio 90
-	PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
-	vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i -t 1 -d $CAN0 -w 2 -c 10000
-	kill $PID_S
+	echo 0 1 > $DRIVER-$i-1000.dat
+	if [ $i != "boost" ] || boost_irq_prio 90; then
+	    PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
+	    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i -t 1 -d $CAN0 -w 0 -c $COUNT
+	    kill $PID_S
+	fi
 	kill $PID_LOAD
+	sleep 1 # Wait for remote buffers to become empty
     done
 }
 
 
 
-PLOT_CMD='
-set title "Round-trip time with receive ethenet load (`uname -r`)"
+p() { cat <<EOF
+set title "Round-trip time with receive ethernet load"
 set logscale y
 set grid
-set xlabel "Time [{/Symbol m}s]"
+set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:] "socketcan-norm-1000.dat" with lp title "Socketcan",\
-          "lincan-norm-1000.dat" with lp title "Lincan",\
-          "socketcan-boost-1000.dat" with lp title "Socketcan boosted IRQ prio",\
-          "lincan-boost-1000.dat" with lp title "Lincan boosted IRQ prio"
-'
-
+plot [0:] "socketcan-norm-1000.dat" with lp lt 1 title "Socketcan",\
+          "lincan-norm-1000.dat" with lp lt 2 title "Lincan",\
+          "socketcan-boost-1000.dat" with lp lt 1 title "Socketcan boosted IRQ prio",\
+          "lincan-boost-1000.dat" with lp lt 2 title "Lincan boosted IRQ prio"
+EOF
+}