Update 3.0.4 to use socketcan from mainline

[can-benchmark.git] / gw-tests / lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 5df4598cb9cf4148cb9957e5ef7ab2766c5dbff9..8cfcf265094c0f493d7dc78ab8782b33a34edadd 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -91,9 +91,10 @@ traffic_and_length() {
 }
 
 start_load() {
+    unset LATESTER_CONTROL_HACKBENCH
     case $load in
        none) ;;
-       cpu) sshgw 'hackbench -g 3 -l 100000' & 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"
@@ -103,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"
@@ -128,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