X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/4a896b80a58599689b2e9158534a57bb42b399a4..87bc08150624a9c9fb22addc10cfc1c5bad06991:/gw-tests/lib.sh?ds=sidebyside

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index cacde47..0d7fe2c 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -30,8 +30,6 @@ sshgw() {
 }
 
 cleanupgw() {
-    # 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 'cangw -F'
 }
 
@@ -72,6 +70,10 @@ echo_plot() {
     echo -n "    " $plot
 }
 
+traffic_and_length() {
+    echo -o -l $1
+}
+
 _run() {
     if [[ ! "$OPT_PLOT_ONLY" ]]; then
 	kernel_versions=$(sshgw uname -r)
@@ -84,12 +86,25 @@ _run() {
 	cd $dir
 	echo "Working directory: $dir"
 	if [[ ! "$OPT_PLOT_ONLY" ]]; then
+	    # 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'
+            # Delete all vcan interfaces
+	    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 || :'
 	    cleanupgw
+	    
 	    main
 	    cp $script .
 	fi
-	_plot
+	if [[ ! "$OPT_PLOT_DISABLE" ]]; then
+	    _plot
+	fi
     done
 }
 
@@ -108,7 +123,7 @@ _myexit() {
 	error "bug in the test script: No test_end called"
     fi
     if ! test -n "$exit_ok"; then
-	error "FATAL: Command '$cmd' exited with code $code"
+	error "FATAL: Command '$cmd' exit with code $code"
     fi
 }