X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/e2f6ea0a1257b097e4e6278d742733b316d2f553..c36e3d6a2a7c2a96eb98cd1db64a11f508a03677:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 8a8a9e9..8cf99e9 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -33,6 +33,8 @@ PATH=$PWD/../_compiled/bin/:$PATH
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
+    if [[ "$NO_GW_NEEDED" ]]; then return; fi
+
     if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then
 	# Create master connection to speed up subsequenct command.
 	ssh -N -f -M -S $socket root@192.168.2.3 >/dev/null 2>&1
@@ -49,20 +51,21 @@ _plot() {
     rm -rf *.pdf *.png
     for i in "" $ADDITIONAL_PLOTS; do
 	plot_cmds $i | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot.gp
-	if [[ ! -s plot.gp ]]; then return; fi
+	if [[ ! -s plot.gp ]]; then continue; fi
 	if [ -z "$OPT_NO_X11" ]; then
 	    echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
 	fi
-	echo "set terminal pdfcairo solid color enhanced; set output \"graph$i.pdf\";" \
+	test "$(gnuplot --version)" = "gnuplot 4.2 patchlevel 5 " && continue
+	echo "set terminal pdfcairo solid color enhanced; " \
+	     "set output \"graph$i.pdf\";" \
+	     "set pointsize 0.5;" \
 	    "$(< plot.gp)" | gnuplot
 	echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \
 	    "$(< plot.gp)" | gnuplot > graph$i.png
-	mkdir -p thumb
 	convert -resize 150x105 -gamma 0.5 -quality 90 -type Palette -depth 8 graph$i.png tgraph$i.png
 #     echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \
 # 	"$(< plot.gp)" | gnuplot > thumb/${testname}$i.png
     done
-
 }
 
 echo_plot() {
@@ -109,25 +112,31 @@ _measure() {
     # Kill load generators left possibly from the past runs
     killall -q ping || :
     killall -q latester || :
-    sshgw 'killall -q hackbench || :'
-    # 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
-    ifconfig can1 txqueuelen 200
-    cleanupgw
-
-    type prepare >/dev/null 2>&1 && prepare || :
-    start_load
+    if [[ ! "$NO_GW_NEEDED" ]]; then
+	sshgw 'killall -q hackbench || :'
+	# 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
+	ifconfig can1 txqueuelen 200
+	cleanupgw
+
+	type prepare >/dev/null 2>&1 && prepare || :
+	start_load
+    fi
+
     main
-    kill_load
+
+    if [[ ! "$NO_GW_NEEDED" ]]; then
+	kill_load
+    fi
 
     # Create a plot script at the end to signalize that the
     # measurement was successfully finished