From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 9 Dec 2010 23:36:35 +0000 (+0100)
Subject: Implement different loads
X-Git-Tag: fix-allnoconfig~233^2~16
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/a6ea2ee6908867e10d49a461c2dcb9dbcb06f5d3

Implement different loads
---

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 05b28d1..d176f22 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -3,6 +3,7 @@ set -e
 COUNT=10000
 
 OPT_TRAFFIC=oneatatime
+OPT_LOAD=none
 
 error() {
     echo $1 >&2
@@ -19,6 +20,11 @@ while [ $# -gt 0 ]; do
 		*) error "Unknown traffic specification: $2";;
     	    esac;
     	    shift 2;;
+	-l) case "$2" in
+		all|none|cpu|eth|can) OPT_LOAD=$2;;
+		*) error "Unknown load specification: $2";;
+	    esac;
+	    shift 2;;
     esac
 done
 
@@ -73,15 +79,29 @@ traffic_and_length() {
 	flood) opts='';;
 	50) 	   opts="-p $((2*(44+$1*8)))";;
 	oneatatime) 	   opts="-o";;
-	*) error "Unknown traffic specification"
+	*) error "Unknown traffic specification: $traffic"
     esac
     echo $opts -l $1
 }
 
 start_load() {
+    case $load in
+	none) ;;
+	cpu) sshgw 'hackbench -g 3 -l 10000' & loadpid=$!;;
+	eth) ping -f -s 60000 -q 192.168.2.3 & loadpid=$!;; # TODO: Generate eth load from another computer
+	can) latester -q -d can1 -i 0x7ff & loadpid=$!;;
+	*) error "Unknown load specification: $load"
+    esac
 }
 
 kill_load() {
+    case $load in
+	none) ;;
+	cpu) kill $loadpid; sshgw "killall -q hackbench || :";;
+	eth) kill $loadpid;;
+	can) kill $loadpid;;
+	*) error "Unknown load specification: $load"
+    esac
 }
 
 _measure() {
@@ -93,10 +113,15 @@ _measure() {
 	export kvers=$kvers
 	export hostkvers=$hostkvers
 	export traffic=$traffic
+	export load=$load
 	cd \$(dirname \$0)/$(dirname $script)
 	exec ./$(basename $script) --plot "\$@"
 	EOF
     chmod +x plot.sh
+    # Kill load generators left possibly from the past runs
+    killall -q ping || :
+    killall -q latester || :
+    sshgw 'killall -q hackbench || :'
     # 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
@@ -108,9 +133,10 @@ _measure() {
     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
+    ifconfig can1 txqueuelen 200
     cleanupgw
 
-    prepare
+    type prepare >/dev/null 2>&1 && prepare || :
     start_load
     main
     kill_load
@@ -122,11 +148,16 @@ _run() {
     then traffics="flood 50 oneatatime"
     else traffics=${traffic:-$OPT_TRAFFIC}
     fi
+    if [[ $OPT_LOAD = all ]]
+    then loads="none cpu eth" # TODO: can
+    else loads=${load:-$OPT_LOAD}
+    fi
     hostkvers=${hostkvers:-host-$(uname -r)}
     kvers=${kvers:-$(sshgw uname -r)}
     test=$(basename $0 .sh)
+    for load in $loads; do
     for traffic in $traffics; do
-	dir="results/$hostkvers/$kvers/$traffic/$test"
+	dir="results/$hostkvers/$kvers/$traffic/$load/$test"
 	mkdir -p $dir
 	script=$(echo $dir | sed -e 's/[^/]*/../g')/${test}.sh
 	cd $dir
@@ -139,6 +170,7 @@ _run() {
 	fi
 	cd - > /dev/null
     done
+    done
 }
 
 test_end() {