Plotting reworked

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 72d635e661a03b29afc9b39fe04983b266814282..f4e74aca3eff66e1e802457fa9114d736577d66f 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -1,29 +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;;
+       -P|--no-plot) OPT_PLOT_DISABLE=1; shift;;
+       -p|--plot) OPT_PLOT_ONLY=1; shift;;
        -X|--no-x11-plot) OPT_NO_X11=1; shift;;
+       -t) case "$2" in
+               all|flood|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)
+    if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then
+       # 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 "$@"
@@ -37,6 +44,7 @@ _plot() {
     local testname=`basename $0 .sh`
 
     plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/" > plot.gp
+    if [[ ! -s plot.gp ]]; then return; fi
     if [ -z "$OPT_NO_X11" ]; then
        echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
     fi
@@ -52,17 +60,6 @@ _plot() {
 
 }
 
-create_dirs_and_links() {
-    local test=$1
-    local kver=$2
-
-    local  d=results/by-kern/$kver/$test
-    mkdir -p $d
-    mkdir -p results/by-test/$test
-    ln -sfT ../../${d#results/} results/by-test/$test/$kver
-    echo $d
-}
-
 echo_plot() {
     plot=$1
     [[ "$_plot_separator" ]] && echo ", \\"
@@ -70,37 +67,73 @@ echo_plot() {
     echo -n "    " $plot
 }
 
+traffic_and_length() {
+    local opts
+    case $traffic in
+       flood) opts='';;
+       50)        opts="-p $((2*(44+$1*8)))";;
+       oneatatime)        opts="-o";;
+       *) error "Unknown traffic specification"
+    esac
+    echo $opts -l $1
+}
+
+_measure() {
+    # Remove data from the last measurement
+    rm -rf *
+    touch .results
+    cat > plot.sh <<-EOF
+       #!/bin/bash
+       export kvers=$kvers
+       export hostkvers=$hostkvers
+       export traffic=$traffic
+       cd \$(dirname \$0)/$(dirname $script)
+       exec ./$(basename $script) --plot
+       EOF
+    chmod +x plot.sh
+    # 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
+    sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
+    # Reset priorities
+    sshgw 'if pid=`pidof irq/145-can0`; then chrt -p -f 50 $pid > /dev/null; fi'
+    sshgw 'if pid=`pidof irq/146-can1`; then chrt -p -f 50 $pid > /dev/null; fi'
+    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
+    ifconfig can0 txqueuelen 200
+    cleanupgw
+    
+    main
+}
+
+
 _run() {
-    if [[ ! "$OPT_PLOT_ONLY" ]]; then
-       kernel_versions=$(sshgw uname -r)
-    else
-       kernel_versions=$(ls results/by-kern)
+    if [[ $OPT_TRAFFIC = all ]]
+    then traffics="flood 50 oneatatime"
+    else traffics=${traffic:-$OPT_TRAFFIC}
     fi
-    for kvers in $kernel_versions; do
-       dir=$(create_dirs_and_links $(basename $0 .sh) $kvers)
-       script=$PWD/$0
+    hostkvers=${hostkvers:-host-$(uname -r)}
+    kvers=${kvers:-$(sshgw uname -r)}
+    test=$(basename $0 .sh)
+    for traffic in $traffics; do
+       dir="results/$hostkvers/$kvers/$traffic/$test"
+       mkdir -p $dir
+       script=$(echo $dir | sed -e 's/[^/]*/../g')/${test}.sh
        cd $dir
        echo "Working directory: $dir"
        if [[ ! "$OPT_PLOT_ONLY" ]]; then
-           # Remove data from the last measurement
-           rm -rf *
-            # 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
-           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 || :'
-           sshgw 'chrt -p -f 50 `pidof irq/146-can1` > /dev/null || :'
-           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 .
+           _measure
        fi
        if [[ ! "$OPT_PLOT_DISABLE" ]]; then
-           _plot
+           if [[ "$OPT_PLOT_ONLY" ]]; then
+               _plot
+           else
+               # Call ourselves once again
+               ./plot.sh
+           fi
        fi
+       cd -
     done
 }
 
@@ -119,7 +152,7 @@ _myexit() {
        error "bug in the test script: No test_end called"
     fi
     if ! test -n "$exit_ok"; then
-       error "FATAL: Command '$cmd' exited with code $code"
+       error "FATAL: Command '$cmd' exit with code $code"
     fi
 }