X-Git-Url: http://git.vrable.net/?p=bluesky.git;a=blobdiff_plain;f=cloudbench%2Fparalleltest.py;h=19ee695b6f7bd4ae2adae53cc2e8eba9fc80b455;hp=8af4cb49b35fa6303753b4565027b059140bfff1;hb=HEAD;hpb=710fc5d5d9401b7c99b9e85021bace515b600546

diff --git a/cloudbench/paralleltest.py b/cloudbench/paralleltest.py
index 8af4cb4..19ee695 100755
--- a/cloudbench/paralleltest.py
+++ b/cloudbench/paralleltest.py
@@ -1,5 +1,32 @@
 #!/usr/bin/python
 #
+# Copyright (C) 2010  The Regents of the University of California
+# Written by Michael Vrable <mvrable@cs.ucsd.edu>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
 # Run a series of simple test requests against S3 for gathering some basic
 # performance numbers.
 
@@ -95,11 +122,11 @@ def run_test(size, threads, num, logfile=sys.stdout, delay=1.0):
 
 connections = [S3TestConnection() for _ in range(128)]
 logfile = open('multifetch-simulation.data', 'a')
-for s in SIZES:
+for s in [(1 << s) for s in range(16, 27)]:
     print "Priming objects: %d-byte objects" % (s,)
     run_test(s, 1, 100, open('/dev/null', 'w'), 0.0)
 
-    for blocksize in [1 << 20, 2 << 20, 4 << 20, 8 << 20]:
+    for blocksize in [x << 20 for x in (4, 8, 16, 32, 64, 128)]:
         if s > blocksize: continue
         for t in [4, 2, 1]:
             for rep in range(10):