From 561dbe8f0b2290ea598b99dc78a52088f5c3649f Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Wed, 27 Jul 2011 11:31:00 -0700
Subject: [PATCH] Measure and record duration of write and read stages in
 roundtrip test.

---
 s3tests/roundtrip.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/s3tests/roundtrip.py b/s3tests/roundtrip.py
index e1a0f1c..0279ad7 100644
--- a/s3tests/roundtrip.py
+++ b/s3tests/roundtrip.py
@@ -168,6 +168,7 @@ def main():
             w=config.roundtrip.writers,
             )
         pool = gevent.pool.Pool(size=config.roundtrip.writers)
+        start = time.time()
         for objname in objnames:
             fp = next(files)
             pool.spawn_link_exception(
@@ -178,6 +179,12 @@ def main():
                 queue=q,
                 )
         pool.join()
+        stop = time.time()
+        elapsed = stop - start
+        q.put(dict(
+                type='write_done',
+                duration=int(round(elapsed * NANOSECOND)),
+                ))
 
         print "Reading {num} objects with {w} workers...".format(
             num=config.roundtrip.files.num,
@@ -186,6 +193,7 @@ def main():
         # avoid accessing them in the same order as the writing
         rand.shuffle(objnames)
         pool = gevent.pool.Pool(size=config.roundtrip.readers)
+        start = time.time()
         for objname in objnames:
             pool.spawn_link_exception(
                 reader,
@@ -194,6 +202,12 @@ def main():
                 queue=q,
                 )
         pool.join()
+        stop = time.time()
+        elapsed = stop - start
+        q.put(dict(
+                type='read_done',
+                duration=int(round(elapsed * NANOSECOND)),
+                ))
 
         q.put(StopIteration)
         logger_g.get()