From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Fri, 3 Dec 2010 23:00:36 +0000 (+0100)
Subject: Allow running tests for all types of traffic
X-Git-Tag: fix-allnoconfig~263
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/2e64d06c62af2edad0f9233c5e57ff6e3cef0c88

Allow running tests for all types of traffic
---

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index c6bf93f..46031a4 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -1,30 +1,36 @@
 set -e
 
+COUNT=10000
+
+OPT_TRAFFIC=oneatatime
+
+error() {
+    echo $1 >&2
+    exit 1
+}
+
 while [ $# -gt 0 ]; do
     case "$1" in
 	-P) OPT_PLOT_DISABLE=1; shift;;
 	-p) OPT_PLOT_ONLY=1; shift;;
 	-X|--no-x11-plot) OPT_NO_X11=1; shift;;
-	-t) OPT_TRAFFIC=$2; shift 2;;
+	-t) case "$2" in
+		all|floof|50|oneatatime) OPT_TRAFFIC=$2;;
+		*) error "Unknown traffic specification: $2";;
+    	    esac;
+    	    shift 2;;
     esac
 done
 
 PATH=$PWD/../_compiled/bin/:$PATH
 
-COUNT=10000
-
-error() {
-    echo $1 >&2
-    exit 1
-}
-
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
     if [[ ! -S $socket ]]; then
-        # Create master connection to speed up subsequenct command.
-        # The ssh is put into background and the connection is closed
-        # after 10 minutes)
+	# Create master connection to speed up subsequenct command.
+	# The ssh is put into background and the connection is closed
+	# after 10 minutes)
 	ssh -f -M -S $socket root@192.168.2.3 sleep 600 > /dev/null 2>&1
     fi
     ssh -x -a -S $socket root@192.168.2.3 "$@"
@@ -53,14 +59,13 @@ _plot() {
 
 }
 
-create_dirs_and_links() {
-    local test=$1
-    local kver=$2
+create_dirs() {
+    local kver=$1
+    local traffic=$2
+    local test=$3
 
-    local  d=results/by-kern/$kver/$test
+    local  d=results/$kver/$traffic/$test
     mkdir -p $d
-    mkdir -p results/by-test/$test
-    ln -sfT ../../${d#results/} results/by-test/$test/$kver
     echo $d
 }
 
@@ -74,31 +79,35 @@ echo_plot() {
 traffic_and_length() {
     local opts
     case $OPT_TRAFFIC in
-	all) error "Bug in the test script - traffic cannot be 'all' here.";;
-	flood|100) opts='';;
+	flood) opts='';;
 	50) 	   opts="-p $((2*(44+$1*8)))";;
-	*) 	   opts="-o";;
+	oneatatime) 	   opts="-o";;
+	*) error "Unknown traffic specification"
     esac
     echo $opts -l $1
 }
 
 _run() {
-    if [[ ! "$OPT_PLOT_ONLY" ]]; then
-	kernel_versions=$(sshgw uname -r)
-    else
-	kernel_versions=$(ls results/by-kern)
+    if [[ ! "$OPT_PLOT_ONLY" ]]
+    then kernel_versions=$(sshgw uname -r)
+    else kernel_versions=$(ls results/by-kern)
+    fi
+    if [[ $OPT_TRAFFIC = all ]]
+    then traffics="flood 50 oneatatime"
+    else traffics=$OPT_TRAFFIC
     fi
+    for OPT_TRAFFIC in $traffics; do
     for kvers in $kernel_versions; do
-	dir=$(create_dirs_and_links $(basename $0 .sh) $kvers)
+	dir=$(create_dirs $kvers $OPT_TRAFFIC $(basename $0 .sh))
 	script=$PWD/$0
 	cd $dir
 	echo "Working directory: $dir"
 	if [[ ! "$OPT_PLOT_ONLY" ]]; then
 	    # Remove data from the last measurement
 	    rm -rf *
-            # Set can interfaces up
+	    # 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
+	    # 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 || :'
@@ -106,7 +115,7 @@ _run() {
 	    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
@@ -114,6 +123,7 @@ _run() {
 	    _plot
 	fi
     done
+    done
 }
 
 test_end() {