X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/dc339fcb790e6956b559dc82992194eae6071611..b0d0a09235093cf11fbe83ce502d7079bc255f7e:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 8cf99e9..8cfcf26 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -33,7 +33,11 @@ PATH=$PWD/../_compiled/bin/:$PATH
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
-    if [[ "$NO_GW_NEEDED" ]]; then return; fi
+    if [[ "$1" = "-f" ]]; then
+	    shift
+    else
+    	if [[ "$NO_GW_NEEDED" ]]; then return; fi
+    fi
 
     if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then
 	# Create master connection to speed up subsequenct command.
@@ -87,9 +91,10 @@ traffic_and_length() {
 }
 
 start_load() {
+    unset LATESTER_CONTROL_HACKBENCH
     case $load in
 	none) ;;
-	cpu) sshgw 'hackbench -g 3 -l 10000' & loadpid=$!;;
+	cpu) export LATESTER_CONTROL_HACKBENCH=$(sshgw 'nohup setpgid hackbench -g 3 -l 100000  >/dev/null & echo $!');;
 	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"
@@ -99,7 +104,7 @@ start_load() {
 kill_load() {
     case $load in
 	none) ;;
-	cpu) kill $loadpid; sshgw "killall -q hackbench || :";;
+	cpu) sshgw "kill -9 -$LATESTER_CONTROL_HACKBENCH; killall -q -9 hackbench || :";;
 	eth) kill $loadpid;;
 	can) kill $loadpid;;
 	*) error "Unknown load specification: $load"
@@ -124,6 +129,7 @@ _measure() {
 	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
+	sshgw 'ifconfig can0 txqueuelen 1000; ifconfig can1 txqueuelen 1000'
 	ifconfig can0 txqueuelen 200
 	ifconfig can1 txqueuelen 200
 	cleanupgw
@@ -138,9 +144,10 @@ _measure() {
 	kill_load
     fi
 
-    # Create a plot script at the end to signalize that the
-    # measurement was successfully finished
-    cat > plot.sh <<-EOF
+    if [ ! "$SKIPPED" ]; then
+        # Create a plot script at the end to signalize that the
+        # measurement was successfully finished
+	cat > plot.sh <<-EOF
 	#!/bin/bash
 	export kvers=$kvers
 	export hostkvers=$hostkvers
@@ -149,7 +156,8 @@ _measure() {
 	cd \$(dirname \$0)/$(dirname $script)
 	exec ./$(basename $script) --plot "\$@"
 	EOF
-    chmod +x plot.sh
+	chmod +x plot.sh
+    fi
 }
 
 
@@ -163,7 +171,7 @@ _run() {
     else loads=${load:-$OPT_LOAD}
     fi
     hostkvers=${hostkvers:-host-$(uname -r)}
-    kvers=${kvers:-$(sshgw uname -r)}
+    kvers=${kvers:-$(sshgw -f uname -r)}
     test=$(basename $0 .sh)
     for load in $loads; do
     for traffic in $traffics; do