X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/2e75a9a5b27689240a8b86cfa1687f348686632d..996a2b0eabe48af1e245b96541a18b97fceb0477:/tests/_lib.sh

diff --git a/tests/_lib.sh b/tests/_lib.sh
index a8f789f..1474741 100644
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -13,6 +13,7 @@ PATH=$PWD/../_compiled/bin/:$PATH
 
 RTPRIO=${RTPRIO:-60}
 COUNT=${COUNT:-10000}
+export CANPING_MS=1		# Generate plots in milliseconds
 
 boost_irq_prio() {
     local PRIO=${1:-50}
@@ -85,10 +86,25 @@ run_tests() {
     done
 }
 
+kvers() {
+    local cmdline=$(cat /proc/cmdline|sed -e 's/BOOT_IMAGE=[^ ]*//' \
+    	  				  -e 's/root=[^ ]*//' \
+					  -e 's/ro//' \
+					  -e 's/quiet//' \
+					  -e 's/rootfstype=[^ ]*//' \
+					  -e 's/elevator=[^ ]*//' \
+					  -e 's/^ *//' \
+					  -e 's/ *$//'|tr -s ' ' '_')
+    v=$(uname -r)
+    [ -n "$cmdline" ] && v="$v:$cmdline"
+    echo $v
+}
+
 plot() {
-    for i in "${!PLOT_CMD[@]}"; do
-	cmd="${PLOT_CMD[$i]}";
-	cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/'\1 ($(uname -r), CPU\\\\@${clk}Mhz)'/")
+#    for i in "${!PLOT_CMD[@]}"; do
+    for i in 0; do
+	cmd=`p`			# Get plot commands
+	cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($(kvers), CPU\\\\\\\\@${clk}Mhz)\"/")
 	if [ -z "$OPT_NO_X11" ]; then
 	    echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
 	fi
@@ -106,16 +122,16 @@ create_dirs_and_links() {
     local kver=$2
     local clck=$3
 
-    local  d=results/by-test/$test/$kver/$clck
+    local  d=results/by-kern/$kver/$clck/$test
     mkdir -p $d
-    mkdir -p results/by-test/$test/$clck # 1
-    mkdir -p results/by-kern/$kver/$clck # 2
-    mkdir -p results/by-kern/$kver/$test # 3
+    mkdir -p results/by-kern/$kver/$test # 1
+    mkdir -p results/by-test/$test/$kver # 2
+    mkdir -p results/by-test/$test/$clck # 3
     mkdir -p results/by-clck/$clck/$kver # 4
     mkdir -p results/by-clck/$clck/$test # 5
-    ln -sfT ../../../${d#results/} results/by-test/$test/$clck/$kver # 1
-    ln -sfT ../../../${d#results/} results/by-kern/$kver/$clck/$test # 2
-    ln -sfT ../../../${d#results/} results/by-kern/$kver/$test/$clck # 3
+    ln -sfT ../../../${d#results/} results/by-kern/$kver/$test/$clck # 1
+    ln -sfT ../../../${d#results/} results/by-test/$test/$kver/$clck # 2
+    ln -sfT ../../../${d#results/} results/by-test/$test/$clck/$kver # 3
     ln -sfT ../../../${d#results/} results/by-clck/$clck/$kver/$test # 4
     ln -sfT ../../../${d#results/} results/by-clck/$clck/$test/$kver # 5
     echo $d
@@ -123,10 +139,15 @@ create_dirs_and_links() {
 
 go() {
     echo "####################"
-    mhz=${MHZ:-2400 300}
+    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
     for clk in $mhz; do
     echo "===================="
-	dir=$(create_dirs_and_links `basename $0 .sh` `uname -r` $clk)
+	dir=$(create_dirs_and_links `basename $0 .sh` `kvers` $clk)
 	set -x
 	pushd $dir