[CalendarServer-changes] [6672] CalendarServer/trunk/contrib/performance
source_changes at macosforge.org
source_changes at macosforge.org
Mon Dec 6 06:49:15 PST 2010
Revision: 6672
http://trac.macosforge.org/projects/calendarserver/changeset/6672
Author: exarkun at twistedmatrix.com
Date: 2010-12-06 06:49:11 -0800 (Mon, 06 Dec 2010)
Log Message:
-----------
When uploading, make benchmark list optional, and discover it from the data file if it is not specified.
Modified Paths:
--------------
CalendarServer/trunk/contrib/performance/massupload.py
CalendarServer/trunk/contrib/performance/sample.sh
Modified: CalendarServer/trunk/contrib/performance/massupload.py
===================================================================
--- CalendarServer/trunk/contrib/performance/massupload.py 2010-12-03 22:06:02 UTC (rev 6671)
+++ CalendarServer/trunk/contrib/performance/massupload.py 2010-12-06 14:49:11 UTC (rev 6672)
@@ -48,8 +48,13 @@
fname = options['filename']
raw = pickle.load(file(fname))
+ if not options['benchmarks']:
+ benchmarks = raw.keys()
+ else:
+ benchmarks = options['benchmarks'].split()
+
def go():
- for benchmark in options['benchmarks'].split():
+ for benchmark in benchmarks:
for param in options['parameters'].split():
for statistic in options['statistics'].split():
stat, samples = select(
Modified: CalendarServer/trunk/contrib/performance/sample.sh
===================================================================
--- CalendarServer/trunk/contrib/performance/sample.sh 2010-12-03 22:06:02 UTC (rev 6671)
+++ CalendarServer/trunk/contrib/performance/sample.sh 2010-12-06 14:49:11 UTC (rev 6672)
@@ -46,7 +46,6 @@
--url $ADDURL --revision $REV \
--revision-date "$DATE" --environment nmosbuilder \
--backend $backend \
- --benchmarks "$BENCHMARKS" \
--parameters "1 9 81" \
--statistics "${STATISTICS[*]}" \
$data
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101206/e5d19983/attachment.html>
More information about the calendarserver-changes
mailing list