From 1cb5e0dae569af23f7caacd5194297227e11887d Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 12 Apr 2010 14:05:58 +0200
Subject: [PATCH 1/1] Some uncommited changes found on my laptop

---
 Makefile.omk            |  2 ++
 canping                 |  2 +-
 tests/00-rtt.sh         |  4 ++--
 tests/_lib.sh           | 19 ++++++++++++-------
 tests/ethflood64k-w2.sh |  2 +-
 tests/rtt-virtual.sh    | 14 +++++---------
 tests/rtt-w.sh          | 14 +++++++-------
 7 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/Makefile.omk b/Makefile.omk
index d03639f..de85fa3 100644
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -2,6 +2,8 @@ SUBDIRS += ocera-can/canvca/libvca/
 SUBDIRS += ocera-can/lincan/
 SUBDIRS += ocera-can/utils/
 SUBDIRS += canping/src/
+SUBDIRS += utils
 
 bin_PROGRAMS = hackbench
 hackbench_SOURCES = hackbench.c
+
diff --git a/canping b/canping
index c690961..9c02efb 160000
--- a/canping
+++ b/canping
@@ -1 +1 @@
-Subproject commit c6909617dbb0c2b519fb23c1d9c6ec8c95b4484e
+Subproject commit 9c02efb698d2072ac7de98f5f606b44280c40518
diff --git a/tests/00-rtt.sh b/tests/00-rtt.sh
index 84cfbad..f20a414 100755
--- a/tests/00-rtt.sh
+++ b/tests/00-rtt.sh
@@ -16,8 +16,8 @@ set logscale y
 set grid
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:] "socketcan-1000.dat" with lp title "Socketcan",\
-              "lincan-1000.dat" with lp title "Lincan"
+plot [0:] "socketcan-1000.dat" with steps title "Socketcan",\
+              "lincan-1000.dat" with steps title "Lincan"
 EOF
 }
 
diff --git a/tests/_lib.sh b/tests/_lib.sh
index c512d35..930f688 100644
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -30,7 +30,7 @@ boost_irq_prio() {
 }
 
 rmmod_can() {
-    modprobe -r lincan kvaser_pci vcan
+    modprobe -r lincan kvaser_pci vcan || true
 }
 
 prepare_lincan_hw() {
@@ -78,7 +78,7 @@ prepare_socketcan_hw() {
 prepare_socketcan_virtual() {
     rmmod_can
     modprobe vcan
-    ip link add dev vcan0 type vcan
+    ip link add dev vcan0 type vcan || true
     ip link set up dev vcan0
     CAN0=socketcan:vcan0
     CAN1=socketcan:vcan0
@@ -114,6 +114,7 @@ kvers() {
 
 plot() {
 #    for i in "${!PLOT_CMD[@]}"; do
+    local testname=`basename $0 .sh`
     for i in 0; do
 	cmd=`p`			# Get plot commands
 	cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($(kvers), CPU\\\\\\\\@${clk}MHz)\"/")
@@ -154,11 +155,15 @@ create_dirs_and_links() {
 
 go() {
     echo "####################"
-    mhz=`sed -ne '/^cpu MHz/ s/.*:\([^.]+\).*/\1/p' /proc/cpuinfo|head -n 1`
-    if [ -r /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq ]; then
-	local max=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`/1000))
-	local min=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`/1000))
-	mhz="$max $min"
+    if [ ! -n "$OPT_PLOT_ONLY" ]; then
+	mhz=`sed -ne '/^cpu MHz/ s/.*:\([^.]\+\).*/\1/p' /proc/cpuinfo|head -n 1`
+	if [ -r /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq ]; then
+	    local max=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`/1000))
+	    local min=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`/1000))
+	    mhz="$max $min"
+	fi
+    else
+	mhz=$(cd results/by-clck; echo *)
     fi
     for clk in $mhz; do
     echo "===================="
diff --git a/tests/ethflood64k-w2.sh b/tests/ethflood64k-w2.sh
index 727bb53..3ddcea9 100755
--- a/tests/ethflood64k-w2.sh
+++ b/tests/ethflood64k-w2.sh
@@ -25,7 +25,7 @@ t() {
 
 
 p() { cat <<EOF
-set title "Round-trip time with ethernet load (ping -fs 64000) 2ms wait between sends"
+set title "Round-trip time with ethernet load (ping -fs 64000) 2ms delay"
 set logscale y
 set grid
 set xlabel "Time [ms]"
diff --git a/tests/rtt-virtual.sh b/tests/rtt-virtual.sh
index 4c3d4c0..d618e06 100755
--- a/tests/rtt-virtual.sh
+++ b/tests/rtt-virtual.sh
@@ -5,12 +5,12 @@
 t() {
     PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN0`
     vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER   -t 1 -d $CAN0 -w 0 -c $COUNT
-    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-1 -t 1 -d $CAN0 -w 1 -c $COUNT
-    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-2 -t 1 -d $CAN0 -w 2 -c $COUNT
+#    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-1 -t 1 -d $CAN0 -w 1 -c $COUNT
+#    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-2 -t 1 -d $CAN0 -w 2 -c $COUNT
     kill $PID_S
 }
 
-TESTS="lincan_virtual socketcan_virtual"
+TESTS=${TESTS:-lincan_virtual socketcan_virtual}
 
 p() { cat <<EOF
 set title "Round-trip time - virtual CAN"
@@ -18,11 +18,7 @@ set logscale y
 set grid
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:] "socketcan-virtual-1000.dat" with lp title "Socketcan 0 ms delay",\
-          "lincan-virtual-1000.dat" with lp title "Lincan 0 ms delay",\
-          "socketcan-virtual-1-1000.dat" with lp lt 1 title "Socketcan 1 ms delay",\
-          "lincan-virtual-1-1000.dat" with lp lt 2 title "Lincan 1 ms delay",\
-          "socketcan-virtual-2-1000.dat" with lp lt 1 title "Socketcan 2 ms delay",\
-          "lincan-virtual-2-1000.dat" with lp lt 2 title  "Lincan 2 ms delay"
+plot [0:] "socketcan-virtual-1000.dat" with lp title "Socketcan - 0 ms delay",\
+          "lincan-virtual-1000.dat" with lp title "Lincan - 0 ms delay"
 EOF
 }
diff --git a/tests/rtt-w.sh b/tests/rtt-w.sh
index 5dcae1a..c196b7a 100755
--- a/tests/rtt-w.sh
+++ b/tests/rtt-w.sh
@@ -13,16 +13,16 @@ t() {
 
 
 p() { cat <<EOF
-set title "Round-trip time depending on delay between sends"
+set title "Round-trip time depending on delay between response reception and next send"
 set logscale y
 set grid
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:] "socketcan-0-1000.dat" with lp lt 1 title "Socketcan 0sms",\
-          "lincan-0-1000.dat" with lp lt 2 title "Lincan 0 ms",\
-          "socketcan-1-1000.dat" with lp lt 1 title "Socketcan 1 ms",\
-          "lincan-1-1000.dat" with lp lt 2 title "Lincan 1 ms",\
-          "socketcan-2-1000.dat" with lp lt 1 title "Socketcan 2 ms",\
-          "lincan-2-1000.dat" with lp lt 2 title  "Lincan 2 ms"
+plot [0:] "socketcan-0-1000.dat" with lp lt 1 title "Socketcan - 0 ms delay",\
+          "lincan-0-1000.dat" with lp lt 2 title "Lincan -  0 ms delay",\
+          "socketcan-1-1000.dat" with lp lt 1 title "Socketcan -  1 ms delay",\
+          "lincan-1-1000.dat" with lp lt 2 title "Lincan -  1 ms delay",\
+          "socketcan-2-1000.dat" with lp lt 1 title "Socketcan -  2 ms delay",\
+          "lincan-2-1000.dat" with lp lt 2 title  "Lincan -  2 ms delay"
 EOF
 }
-- 
2.39.2