From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 15 May 2011 05:53:29 +0000 (-0700)
Subject: Add keepalive support to benchmark, add other command-line args
X-Git-Tag: v2.0.0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a287c203f12bcbef61ff7284d96a2131595fec78;p=thirdparty%2Ftornado.git

Add keepalive support to benchmark, add other command-line args
---

diff --git a/demos/benchmark/benchmark.py b/demos/benchmark/benchmark.py
index 9236a247c..c25a40234 100755
--- a/demos/benchmark/benchmark.py
+++ b/demos/benchmark/benchmark.py
@@ -20,6 +20,9 @@ import subprocess
 
 
 define("port", type=int, default=8888)
+define("n", type=int, default=10000)
+define("c", type=int, default=25)
+define("keepalive", type=bool, default=False)
 
 class RootHandler(RequestHandler):
     def get(self):
@@ -36,9 +39,13 @@ def main():
     app = Application([("/", RootHandler)])
     app.listen(options.port)
     signal.signal(signal.SIGCHLD, handle_sigchld)
-    proc = subprocess.Popen(
-        "ab -n 10000 -c 25 http://127.0.0.1:%d/" % options.port,
-        shell=True)
+    args = ["ab"]
+    args.extend(["-n", str(options.n)])
+    args.extend(["-c", str(options.c)])
+    if options.keepalive:
+        args.append("-k")
+    args.append("http://127.0.0.1:%d/" % options.port)
+    proc = subprocess.Popen(args)
     IOLoop.instance().start()
 
 if __name__ == '__main__':