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 ($(kvers), CPU\\\\@${clk}Mhz)'/")
if [ -z "$OPT_NO_X11" ]; then
echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
fi
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
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