tornado: Reconfigure benchmark_config and setup.

tornado/benchmark_config

@@ -4,11 +4,13 @@
     "default": {
       "setup_file": "setup",
       "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/db?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Platform",
-      "database": "None",
+      "database": "MongoDB",
       "framework": "tornado",
       "language": "Python",
       "orm": "Raw",
@@ -17,13 +19,15 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "tornado",
-      "notes": "",
+      "notes": "CPython 2.7",
       "versus": ""
     },
-    "raw": {
-      "setup_file": "setup",
+    "py3": {
+      "setup_file": "setup_py3",
+      "json_url": "/json",
       "db_url": "/db",
       "query_url": "/db?queries=",
+      "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Platform",
@@ -36,10 +40,10 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "tornado",
-      "notes": "",
+      "notes": "CPython 3.3",
       "versus": ""
     },
-    "pypy-raw": {
+    "pypy": {
       "setup_file": "setup_pypy",
       "json_url": "/json",
       "db_url": "/db",
@@ -52,12 +56,12 @@
       "framework": "tornado",
       "language": "Python",
       "orm": "Raw",
-      "platform": "pypy",
+      "platform": "Tornado",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "tornado-pypy",
-      "notes": "",
+      "notes": "PyPy 2.2",
       "versus": ""
     }
   }]

tornado/server.py

@@ -9,6 +9,9 @@ import tornado.options
 from tornado.options import options
 import tornado.httpserver
 
+if sys.version_info[0] == 3:
+    xrange = range
+
 tornado.options.define('port', default=8888, type=int, help="Server port")
 
 

tornado/setup_py3.py

@@ -2,7 +2,7 @@ import subprocess
 import setup_util
 from os.path import expanduser
 
-python = expanduser('~/FrameworkBenchmarks/installs/py3/bin/python')
+python = expanduser('~/FrameworkBenchmarks/installs/py3/bin/python3')
 cwd = expanduser('~/FrameworkBenchmarks/tornado')
 proc = None
 

tornado/setup_pypy.py

@@ -2,7 +2,7 @@ import subprocess
 import setup_util
 from os.path import expanduser
 
-python = expanduser('~/FrameworkBenchmarks/installs/pypy/bin/python')
+python = expanduser('~/FrameworkBenchmarks/installs/pypy/bin/pypy')
 cwd = expanduser('~/FrameworkBenchmarks/tornado')
 proc = None