X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/46317028413a2c940082b1a61f849994eeac9b11..9ad2ddd1c2c96f1afa1ad0870b1e40ab81fd363d:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 4d6e2d7..da31988 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -44,6 +44,7 @@ _plot() {
     local testname=`basename $0 .sh`
 
     plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/" > plot.gp
+    if [[ ! -s plot.gp ]]; then return; fi
     if [ -z "$OPT_NO_X11" ]; then
 	echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
     fi
@@ -80,7 +81,7 @@ traffic_and_length() {
 _run() {
     if [[ ! "$OPT_PLOT_ONLY" ]]
     then kernel_versions=$(sshgw uname -r)
-    else kernel_versions=$(ls results/by-kern)
+    else kernel_versions= # TODO $(ls results/by-kern)
     fi
     if [[ $OPT_TRAFFIC = all ]]
     then traffics="flood 50 oneatatime"
@@ -97,17 +98,17 @@ _run() {
 	    # Remove data from the last measurement
 	    rm -rf *
 	    # Set can interfaces up
-	    sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
+ 	    sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
 	    # Delete all vcan interfaces
-	    sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
+ 	    sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
 	    # Reset priorities
-	    sshgw 'chrt -p -f 50 `pidof irq/145-can0` > /dev/null || :'
-	    sshgw 'chrt -p -f 50 `pidof irq/146-can1` > /dev/null || :'
-	    sshgw 'chrt -p -f 49 `pidof sirq-net-rx/0` > /dev/null || :'
-	    sshgw 'chrt -p -f 49 `pidof sirq-net-tx/0` > /dev/null || :'
+	    sshgw 'if pid=`pidof irq/145-can0`; then chrt -p -f 50 $pid > /dev/null; fi'
+	    sshgw 'if pid=`pidof irq/146-can1`; then chrt -p -f 50 $pid > /dev/null; fi'
+	    sshgw 'if pid=`pidof sirq-net-rx/0`; then chrt -p -f 49 $pid > /dev/null; fi'
+	    sshgw 'if pid=`pidof sirq-net-tx/0`; then chrt -p -f 49 $pid > /dev/null; fi'
 	    # Set the length of qdisc queue to avoid ENOBUFS errors
 	    ifconfig can0 txqueuelen 200
-	    cleanupgw
+ 	    cleanupgw
 
 	    main
 	    cp $script .