From 962320a303d94583d55b5ae3abb5308da88f619e Mon Sep 17 00:00:00 2001
From: Matus Valo <matusvalo@gmail.com>
Date: Tue, 2 Jan 2018 06:19:05 -0800
Subject: Fix benchmark.py

---
 benchmark.py | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/benchmark.py b/benchmark.py
index 7f17813..2398f13 100644
--- a/benchmark.py
+++ b/benchmark.py
@@ -1,20 +1,18 @@
 import timeit
 
-QS = ("amqplib.benchmark", "librabbit.benchmark")
-
-
 INIT_COMMON = """
 connection = amqp.Connection(hostname="localhost", userid="guest",
-password="guest", virtual_host="/")
+password="guest", virtual_host="/", lazy=True)
+connection.connect()
 channel = connection.channel()
 channel.exchange_declare(Q, "direct")
 channel.queue_declare(Q)
 channel.queue_bind(Q, Q, Q)
 """
 
-INIT_AMQPLIB = """
-from amqplib import client_0_8 as amqp
-Q = "amqplib.benchmark"
+INIT_AMQP = """
+import amqp
+Q = "amqp.benchmark"
 %s
 """ % INIT_COMMON
 
@@ -35,7 +33,7 @@ connection._basic_publish(1, "x" * %d, Q, Q, {})
 """
 
 CONSUME = """
-method = getattr(channel, "wait", None) or connection.drain_events
+method = connection.drain_events
 def callback(m):
     channel.basic_ack(m.delivery_info["delivery_tag"])
 channel.basic_consume(Q, callback=callback)
@@ -45,27 +43,32 @@ for i in range(%(its)d):
 
 
 def bench_basic_publish(iterations=10000, bytes=256):
-    t_publish_amqplib = timeit.Timer(stmt=PUBLISH % bytes,
-                                          setup=INIT_AMQPLIB)
+    t_publish_amqp = timeit.Timer(stmt=PUBLISH % bytes,
+                                  setup=INIT_AMQP)
     t_publish_librabbit = timeit.Timer(stmt=PUBLISH_LIBRABBIT % bytes,
                                        setup=INIT_LIBRABBIT)
-    print("basic.publish: (%s byte messages)" % bytes)
-    print("    amqplib:   %.2f usec/pass" % (
-        iterations * t_publish_amqplib.timeit(number=iterations)/iterations))
-    print("    librabbit: %.2f usec/pass" % (
-        iterations * t_publish_librabbit.timeit(number=iterations)/iterations))
+    print("basic.publish: (%s x %s bytes messages)" % (iterations, bytes))
+    print("    amqp:   %.2f sec/pass" % (
+        iterations * t_publish_amqp.timeit(number=iterations)/iterations)
+    )
+    print("    librabbit: %.2f sec/pass" % (
+        iterations * t_publish_librabbit.timeit(number=iterations)/iterations)
+    )
 
 def bench_basic_consume(iterations=10000):
     context = {"its": (iterations/2)/10}
-    t_consume_amqplib = timeit.Timer(stmt=CONSUME % context,
-                                     setup=INIT_AMQPLIB)
+    t_consume_amqp = timeit.Timer(stmt=CONSUME % context,
+                                  setup=INIT_AMQP)
     t_consume_librabbit = timeit.Timer(stmt=CONSUME % context,
                                        setup=INIT_LIBRABBIT)
     print("basic.consume (%s msg/pass) " % context["its"])
-    print("    amqplib:   %.2f usec/pass" % (
-        10 * t_consume_amqplib.timeit(number=10)/10))
-    print("    librabbit: %.2f usec/pass" % (
-        10 * t_consume_librabbit.timeit(number=10)/10))
+    print("    amqp:   %.2f sec/pass" % (
+        t_consume_amqp.timeit(number=10))
+    )
+    print("    librabbit: %.2f sec/pass" % (
+        t_consume_librabbit.timeit(number=10))
+    )
+
 benchmarks = [bench_basic_publish, bench_basic_consume]
 
 if __name__ == "__main__":
-- 
cgit v1.2.1


From 1db05ff4c6cb8e850c331feea2d63403c2bb56bb Mon Sep 17 00:00:00 2001
From: Matus Valo <matusvalo@gmail.com>
Date: Tue, 2 Jan 2018 06:21:59 -0800
Subject: Add CLI interface to benchmark.py

---
 benchmark.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/benchmark.py b/benchmark.py
index 2398f13..6143682 100644
--- a/benchmark.py
+++ b/benchmark.py
@@ -55,7 +55,7 @@ def bench_basic_publish(iterations=10000, bytes=256):
         iterations * t_publish_librabbit.timeit(number=iterations)/iterations)
     )
 
-def bench_basic_consume(iterations=10000):
+def bench_basic_consume(iterations=10000, bytes=None):
     context = {"its": (iterations/2)/10}
     t_consume_amqp = timeit.Timer(stmt=CONSUME % context,
                                   setup=INIT_AMQP)
@@ -72,7 +72,16 @@ def bench_basic_consume(iterations=10000):
 benchmarks = [bench_basic_publish, bench_basic_consume]
 
 if __name__ == "__main__":
+    import argparse
+
+    parser = argparse.ArgumentParser(description='Runs benchmark against local RabbitMQ instance.')
+    parser.add_argument('--iters', metavar='N', type=int, default=100000,
+                        help='Number of iterations')
+    parser.add_argument('--bytes', metavar='B', type=int,
+                        default=256, help='Message size')
+
+    args = parser.parse_args()
     for benchmark in benchmarks:
-        benchmark(100000)
+        benchmark(args.iters, bytes=args.bytes)
 
 
-- 
cgit v1.2.1