Author: neels
Date: Mon Aug 8 14:48:08 2011
New Revision: 1154976
URL: http://svn.apache.org/viewvc?rev=1154976&view=rev
Log:
Tweaks to benchmark suite1.
* tools/dev/benchmarks/suite1/benchmark.py
(run): Show the path at which svn is not found.
(cmd_run): Comment.
* tools/dev/benchmarks/suite1/run: Make naming of the two svn binaries generic.
Modified:
subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
subversion/trunk/tools/dev/benchmarks/suite1/run
Modified: subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py?rev=1154976&r1=1154975&r2=1154976&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py (original)
+++ subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py Mon Aug 8
14:48:08 2011
@@ -418,7 +418,8 @@ def run(levels, spread, N):
so, se = svn('--version')
if not so:
- print "Can't find svn."
+ ### options comes from the global namespace; it should be passed
+ print "Can't find svn at", options.svn
exit(1)
version = ', '.join([s.strip() for s in so.split('\n')[:2]])
@@ -565,6 +566,9 @@ def cmd_run(timings_path, levels, spread
print '\n\nHi, going to run a Subversion benchmark series of %d runs...' % N
### UGH! should pass to run()
+ ### neels: Today I contemplated doing that, but at the end of the day
+ ### it merely blows up the code without much benefit. If this
+ ### ever becomes part of an imported python package, call again.
global timings
if os.path.isfile(timings_path):
Modified: subversion/trunk/tools/dev/benchmarks/suite1/run
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/suite1/run?rev=1154976&r1=1154975&r2=1154976&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/suite1/run (original)
+++ subversion/trunk/tools/dev/benchmarks/suite1/run Mon Aug 8 14:48:08 2011
@@ -19,11 +19,15 @@
# Where are the svn binaries you want to benchmark?
if [ "$USER" = "neels" ]; then
- SVN_1_6="$HOME/pat/stable/prefix/bin/svn"
- SVN_trunk="$HOME/pat/trunk/prefix/bin/svn"
+ SVN_A_NAME="1.7.x"
+ SVN_A="$HOME/pat/bench/prefix/bin/svn"
+ SVN_B_NAME="trunk"
+ SVN_B="$HOME/pat/trunk/prefix/bin/svn"
else
- SVN_1_6="$HOME/src/svn-1.6.x/subversion/svn/svn"
- SVN_trunk="$HOME/src/svn/subversion/svn/svn"
+ SVN_A_NAME="1.6"
+ SVN_A="$HOME/src/svn-1.6.x/subversion/svn/svn"
+ SVN_B_NAME="trunk"
+ SVN_B="$HOME/src/svn/subversion/svn/svn"
fi
benchmark="$PWD/benchmark.py"
@@ -44,9 +48,9 @@ batch(){
echo "---------------------------------------------------------------------"
echo
echo "Results for dir levels: $levels spread: $spread"
- "$benchmark" "--svn=${SVN_1_6}" run ${pre}1.6 $levels $spread $N >/dev/null
- "$benchmark" "--svn=${SVN_trunk}" run ${pre}trunk $levels $spread $N >
/dev/null
- "$benchmark" compare ${pre}1.6 ${pre}trunk
+ "$benchmark" "--svn=$SVN_A" run "${pre}$SVN_A_NAME" $levels $spread $N
#>/dev/null
+ "$benchmark" "--svn=$SVN_B" run "${pre}$SVN_B_NAME" $levels $spread $N
#>/dev/null
+ "$benchmark" compare "${pre}$SVN_A_NAME" "${pre}$SVN_B_NAME"
}
N=6
@@ -80,11 +84,11 @@ batch $cl $cs $N
echo ""
echo =========================================================================
echo ""
-"$benchmark" combine total_1.6 *x*_1.6 >/dev/null
-"$benchmark" combine total_trunk *x*_trunk >/dev/null
+"$benchmark" combine "total_$SVN_A_NAME" *x*"_$SVN_A_NAME" >/dev/null
+"$benchmark" combine "total_$SVN_B_NAME" *x*"_$SVN_B_NAME" >/dev/null
echo "comparing averaged totals..."
-"$benchmark" compare total_1.6 total_trunk
+"$benchmark" compare "total_$SVN_A_NAME" "total_$SVN_B_NAME"
echo ""
echo "Had started at $started,"
