From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 20 Jan 2014 10:56:01 +0000 (+0100)
Subject: Rename one experiment
X-Git-Tag: fix-allnoconfig~60
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/89805c403e4a1100441b41166840d22f2eb4ec9e

Rename one experiment
---

diff --git a/ugw/data/bench-all.sh b/ugw/data/bench-all.sh
index a718d89..6138288 100755
--- a/ugw/data/bench-all.sh
+++ b/ugw/data/bench-all.sh
@@ -33,7 +33,7 @@ while [ "${1#-}" != "$1" ]; do
     shift
 done
 
-methods=${@:-rtems kernel read-write readnb-write readnb-mmap mmap-write mmap-mmap mmapbusy-write mmapbusy-mmap readbusy-write}
+methods=${@:-rtems kernel read-write readnb-write readnb-mmap mmap-write mmap-mmap mmapbusy-write mmapbusy-mmap readbusy-write readbusynoirq-write}
 
 set -x
 for method in $methods; do
@@ -49,7 +49,7 @@ for method in $methods; do
 	mmapbusy-write) ../ppc/boot -a "ugw=|-r mmapbusy|" --exiton "UGW started";;
 	mmapbusy-mmap)  ../ppc/boot -a "ugw=|-r mmapbusy -t mmap|" --exiton "UGW started";;
 	readbusy-write) ../ppc/boot -a "ugw=|-b 300|" --exiton "UGW started";;
-	readbusy-noirq) ../ppc/boot -a "ugw=|-b 300|" --kernel uImage.noirq --exiton "UGW started";;
+	readbusynoirq-write) ../ppc/boot -a "ugw=|-b 300|" --kernel uImage.noirq --exiton "UGW started";;
 	*)
 	    echo >&2 "Unknown method '$method'";
 	    exit 1;
@@ -59,7 +59,7 @@ for method in $methods; do
 	arg=${args[$i]}
 	dir=${dirs[$i]}
 	set -x
-	ssh glab "latester -d can0 -d can1 -d can2 -c 3200 -q -n $method $arg"
+	ssh glab "sudo ip l set eth0 down; sudo ~/bin/latester -d can0 -d can1 -d can2 -c 5000 -q -n $method $arg; sudo ip l set eth0 up"
 	mkdir -p $dir
 	scp glab:"$method-*.txt" $dir
 	(cd $dir && ln -sf ../Makefile ../plot.gp ../preprocess.m .)
diff --git a/ugw/data/plot-thr.gp b/ugw/data/plot-thr.gp
index b3a4bd4..a157c16 100755
--- a/ugw/data/plot-thr.gp
+++ b/ugw/data/plot-thr.gp
@@ -1,4 +1,7 @@
 #!/usr/bin/env gnuplot
+
+! ./throughput-dep.sh
+
 reset
 set xlabel "Frame period [µs]"
 set ylabel "Latency [µs] + packet loss"
@@ -9,7 +12,7 @@ set ytics (1e1,2e1,5e1,1e2,2e2,5e2,1e3,2e3,5e3,1e4,2e4,5e4,1e5,2e5,5e5)
 set logscale y
 set key reverse Left invert outside
 set grid
-loss_scale=10
+loss_scale=3
 plot [:160] \
      'kernel.dat' using 1:2:($3*loss_scale) title 'kernel', \
      'mmap-mmap.dat' using 1:2:($3*loss_scale) title 'mmap-mmap', \
@@ -18,7 +21,7 @@ plot [:160] \
      'mmapbusy-write.dat' using 1:2:($3*loss_scale) title 'mmapbusy-write', \
      'readnb-mmap.dat' using 1:2:($3*loss_scale) title 'readnb-mmap', \
      'read-mmap.dat' using 1:2:($3*loss_scale) title 'read-mmap', \
-     'readbusy-noirq.dat' using 1:2:($3*loss_scale) title 'readbusy-noirq', \
+     'readbusynoirq-write.dat' using 1:2:($3*loss_scale) title 'readbusynoirq-write', \
      'read-write.dat' using 1:2:($3*loss_scale) title 'read-write', \
      'readbusy-write.dat' using 1:2:($3*loss_scale) title 'readbusy-write', \
      'readnb-write.dat' using 1:2:($3*loss_scale) title 'readnb-write'
diff --git a/ugw/data/preprocess.m b/ugw/data/preprocess.m
index ef729fd..b9a557f 100755
--- a/ugw/data/preprocess.m
+++ b/ugw/data/preprocess.m
@@ -9,7 +9,7 @@ datafiles = {
 	     "mmapbusy-write.dat"
 	     "readnb-write.dat"
 	     "readbusy-write.dat"
-	     "readbusy-noirq.dat"
+	     "readbusynoirq-write.dat"
 	     "readnb-mmap.dat"
 	     "read-mmap.dat"
 	     "read-write.dat"