Allow calling `make html` when results is a symlink

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 46fc5c18ce5cb0fbc036a59604ff5f67c36e6c7a..5ecf2360c391dbd527af897ebbd6e07710c3fc66 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -25,6 +25,7 @@ while [ $# -gt 0 ]; do
                *) error "Unknown load specification: $2";;
            esac;
            shift 2;;
+       -u) OPT_UPDATE=1; shift;;
     esac
 done
 
@@ -33,7 +34,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.
@@ -50,18 +55,18 @@ _plot() {
     local testname=`basename $0 .sh`
     rm -rf *.pdf *.png
     for i in "" $ADDITIONAL_PLOTS; do
-       plot_cmds $i | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot.gp
-       if [[ ! -s plot.gp ]]; then continue; fi
+       plot_cmds $i | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot$i.gp
+       if [[ ! -s plot$i.gp ]]; then continue; fi
        if [ -z "$OPT_NO_X11" ]; then
-           echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
+           echo "set terminal x11 enhanced; $(< plot$i.gp)" | gnuplot -persist
        fi
        test "$(gnuplot --version)" = "gnuplot 4.2 patchlevel 5 " && continue
-       echo "set terminal pdfcairo solid color enhanced; " \
+       echo "set terminal pdfcairo dashed mono enhanced; " \
             "set output \"graph$i.pdf\";" \
             "set pointsize 0.5;" \
-           "$(< plot.gp)" | gnuplot
+           "$(< plot$i.gp)" |sed -e 's/lc [0-9]//'| gnuplot
        echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \
-           "$(< plot.gp)" | gnuplot > graph$i.png
+           "$(< plot$i.gp)" | gnuplot > graph$i.png
        convert -resize 150x105 -gamma 0.5 -quality 90 -type Palette -depth 8 graph$i.png tgraph$i.png
 #     echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \
 #      "$(< plot.gp)" | gnuplot > thumb/${testname}$i.png
@@ -87,9 +92,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"
@@ -99,7 +105,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"
@@ -107,6 +113,7 @@ kill_load() {
 }
 
 _measure() {
+    if [[ "$OPT_UPDATE" && -f plot.sh && ( plot.sh -nt $test.sh ) ]]; then echo "skiping: up-to-date"; return; fi
     # Remove data from the last measurement
     rm -rf *
     # Kill load generators left possibly from the past runs
@@ -124,6 +131,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 +146,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 +158,8 @@ _measure() {
        cd \$(dirname \$0)/$(dirname $script)
        exec ./$(basename $script) --plot "\$@"
        EOF
-    chmod +x plot.sh
+       chmod +x plot.sh
+    fi
 }
 
 
@@ -163,7 +173,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