Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

[can-benchmark.git] / tests / ethloadsend.sh

diff --git a/tests/ethloadsend.sh b/tests/ethloadsend.sh
index a72020263a2799903ea4d5df54204c58b7c383a4..59c160afb3a215544ddb793ee7425bcedd1ea343 100755 (executable)
--- a/tests/ethloadsend.sh
+++ b/tests/ethloadsend.sh
@@ -3,23 +3,24 @@
 . _lib.sh
 
 t() {
-    ( find -L /usr/src/linux -type f -exec cat '{}' ';'|ssh root@${SSH_CONNECTION%% *} 'cat > /dev/null' ) &
+    find -L /usr/src/linux -type f -exec cat '{}' ';'|ssh root@${SSH_CONNECTION%% *} 'cat > /dev/null' &
     PID_LOAD=$!
     PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
-    vca_canping -m 1 -R FF:$RTPRIO FF:$RTPRIO -v -g $DRIVER -t 1 -d $CAN0 -w 2 -c 10000
+    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER -t 1 -d $CAN0 -w 0 -c $COUNT
     kill $PID_S
-    kill $PID_LOAD
+    kill %%  # Kill the whole pipe above
+    sleep 1 # Wait for ethernet buffers to become empty
 }
 
 
 
-PLOT_CMD='
-set title "Round-trip time with receive ethenet load (`uname -r`)"
+p() { cat <<EOF
+set title "Round-trip time with send ethernet load (TCP)"
 set logscale y
 set grid
-set xlabel "Time [{/Symbol m}s]"
+set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
 plot [0:] "socketcan-1000.dat" with lp title "Socketcan",\
           "lincan-1000.dat" with lp title "Lincan"
-'
-
+EOF
+}