Changeset 989

Timestamp:

03/02/06 02:05:04

Author:

fumanchu

Message:

New Engine.response_class attribute (which allows a new -null switch for benchmark.py, to show how much of the request is spent in the HTTP server as opposed to the Request object).

Files:

• trunk/cherrypy/_cpengine.py (modified) (2 diffs)
• trunk/cherrypy/test/bench_mp.conf (modified) (1 diff)
• trunk/cherrypy/test/benchmark.py (modified) (4 diffs)

trunk/cherrypy/_cpengine.py

@@ -21 +21 @@
-    
-    request_class = _cphttptools.Request
+    response_class = _cphttptools.Response
-    
-    def __init__(self):
@@ -187 +188 @@
-                               remoteHost, scheme)
-        cherrypy.serving.request = r
-_cphttptools.Response
+self.response_class
-        return r
-

trunk/cherrypy/test/bench_mp.conf

@@ -7 +7 @@
-<Location />
-    SetHandler python-program
-
+
+
+
+
+
+
+
+
-    PythonHandler modpython_gateway::handler
-    PythonOption application cherrypy._cpwsgi::wsgiApp

trunk/cherrypy/test/benchmark.py

@@ -10 +10 @@
-
-import cherrypy
+from cherrypy.lib import httptools
-
-
@@ -212 +213 @@
-
-
+class NullRequest:
+    """A null HTTP request class, returning 204 and an empty body."""
+    
+    def __init__(self, remoteAddr, remotePort, remoteHost, scheme="http"):
+        pass
+    
+    def close(self):
+        pass
+    
+    def run(self, requestLine, headers, rfile):
+        cherrypy.response.status = "204 No Content"
+        cherrypy.response.header_list = [("Content-Type", 'text/html'),
+                                         ("Server", "Null CherryPy"),
+                                         ("Date", httptools.HTTPDate()),
+                                         ("Content-Length", "0"),
+                                         ]
+        cherrypy.response.body = [""]
+        return cherrypy.response
+
+
+class NullResponse:
+    pass
+
+
-started = False
-def startup(req=None):
@@ -218 +243 @@
-    if not started:
-        started = True
+        cherrypy.server.start(init_only=True, server_class=None)
+    return 0 # apache.OK
+
+def startup_null(req=None):
+    """Start the CherryPy app server in NULL 'serverless' mode (for WSGI)."""
+    global started
+    if not started:
+        started = True
+        cherrypy.server.request_class = NullRequest
+        cherrypy.server.response_class = NullResponse
-        cherrypy.server.start(init_only=True, server_class=None)
-    return 0 # apache.OK
@@ -242 +277 @@
-        try:
-            mpconf = os.path.join(curdir, "bench_mp.conf")
-
+
+
+
+
+
-            run()
-        finally:
-            os.popen("apache -k stop")
-    else:
+        if "-null" in sys.argv:
+            cherrypy.server.request_class = NullRequest
+            cherrypy.server.response_class = NullResponse
+        
-        # This will block
-        cherrypy.server.start_with_callback(run)