X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/4c67ef4ac4a3ccd23642f58a3d65cbf0a178b874..c602425056bbe84fd1baeb2e75172108760c9b9a:/gw-tests/lib.sh?ds=sidebyside

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 3ea4153..cc5f1b6 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -2,6 +2,8 @@ set -e
 
 PATH=$PWD/../_compiled/bin/:$PATH
 
+COUNT=10000
+
 error() {
     echo $1 >&2
     exit 1
@@ -19,39 +21,37 @@ sshgw() {
     ssh -x -a -S $socket root@192.168.2.3 "$@"
 }
 
-cleanupgw() {
+_cleanupgw() {
     # 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 GW rules
     sshgw 'eval $(cangw -L|sed -e s/-A/-D/ -e "s/#.*/;/")'
 }
 
-plot() {
-#    for i in "${!PLOT_CMD[@]}"; do
+_plot() {
     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)\"/")
-	if [ -z "$OPT_NO_X11" ]; then
-	    echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
-	fi
-	I=${i/0/}
-	echo 'set terminal postscript color eps enhanced size 6cm,4cm lw 1 "Times-Roman" 10;' \
-	     'set lmargin 8;' \
-	      "${cmd}" | gnuplot > ${testname}$I.eps
-	echo "set terminal postscript color eps enhanced;" \
-	     "${cmd}" | gnuplot | epstopdf --filter > ${testname}$I.pdf
-	mkdir -p thumb
-	convert -density 30  -gamma 0.5 -quality 90 -type Palette -depth 8 ${testname}$I.pdf thumb/${testname}$I.png
-	convert -density 150 -gamma 0.7 -quality 90 -type Palette -depth 8 ${testname}$I.pdf ${testname}$I.png
-    done
+
+    cmd=$(plot_cmds)			# Get plot commands
+    cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/")
+    if [ -z "$OPT_NO_X11" ]; then
+	echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
+    fi
+    I=''
+    echo 'set terminal postscript color eps enhanced size 6cm,4cm lw 1 "Times-Roman" 10;' \
+	'set lmargin 8;' \
+	"${cmd}" | gnuplot > ${testname}$I.eps
+    echo "set terminal postscript color eps enhanced;" \
+	"${cmd}" | gnuplot | epstopdf --filter > ${testname}$I.pdf
+    mkdir -p thumb
+    convert -density 30  -gamma 0.5 -quality 90 -type Palette -depth 8 ${testname}$I.pdf thumb/${testname}$I.png
+    convert -density 150 -gamma 0.7 -quality 90 -type Palette -depth 8 ${testname}$I.pdf ${testname}$I.png
+
 }
 
 create_dirs_and_links() {
     local test=$1
     local kver=$2
 
-    set -x
     local  d=results/by-kern/$kver/$test
     mkdir -p $d
     mkdir -p results/by-test/$test
@@ -60,10 +60,12 @@ create_dirs_and_links() {
 }
 
 _run() {
-    cleanupgw
-    dir=$(create_dirs_and_links $(basename $0 .sh)  $(sshgw uname -r))
+    _cleanupgw
+    kvers=$(sshgw uname -r)
+    dir=$(create_dirs_and_links $(basename $0 .sh) $kvers)
     cd $dir
     main
+    _plot
 }
 
 test_end() {