X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/2e64d06c62af2edad0f9233c5e57ff6e3cef0c88..9109d42725cebef9c99c8cbd9eed494ba0c54e89:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 46031a4..43afe6d 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -15,7 +15,7 @@ while [ $# -gt 0 ]; do
 	-p) OPT_PLOT_ONLY=1; shift;;
 	-X|--no-x11-plot) OPT_NO_X11=1; shift;;
 	-t) case "$2" in
-		all|floof|50|oneatatime) OPT_TRAFFIC=$2;;
+		all|flood|50|oneatatime) OPT_TRAFFIC=$2;;
 		*) error "Unknown traffic specification: $2";;
     	    esac;
     	    shift 2;;
@@ -59,16 +59,6 @@ _plot() {
 
 }
 
-create_dirs() {
-    local kver=$1
-    local traffic=$2
-    local test=$3
-
-    local  d=results/$kver/$traffic/$test
-    mkdir -p $d
-    echo $d
-}
-
 echo_plot() {
     plot=$1
     [[ "$_plot_separator" ]] && echo ", \\"
@@ -98,7 +88,8 @@ _run() {
     fi
     for OPT_TRAFFIC in $traffics; do
     for kvers in $kernel_versions; do
-	dir=$(create_dirs $kvers $OPT_TRAFFIC $(basename $0 .sh))
+	dir="results/host-$(uname -r)/$kvers/$OPT_TRAFFIC/$(basename $0 .sh)"
+	mkdir -p $dir
 	script=$PWD/$0
 	cd $dir
 	echo "Working directory: $dir"
@@ -114,6 +105,8 @@ _run() {
 	    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 || :'
+	    # Set the length of qdisc queue to avoid ENOBUFS errors
+	    ifconfig can0 txqueuelen 200
 	    cleanupgw
 
 	    main
@@ -122,6 +115,7 @@ _run() {
 	if [[ ! "$OPT_PLOT_DISABLE" ]]; then
 	    _plot
 	fi
+	cd -
     done
     done
 }