Changeset 1193

Timestamp:

07/10/06 01:25:49

Author:

fumanchu

Message:

Moved profiling into WSGI middleware.

Files:

• trunk/cherrypy/_cprequest.py (modified) (3 diffs)
• trunk/cherrypy/lib/profiler.py (modified) (2 diffs)
• trunk/cherrypy/test/helper.py (modified) (2 diffs)

trunk/cherrypy/_cprequest.py

@@ -9 +9 @@
-from cherrypy import _cpcgifs
-from cherrypy._cperror import format_exc, bare_error
-, profiler
+
-
-
@@ -139 +139 @@
-        self.handler = None
-        
-        # Set up the profiler if requested.
-        conf = cherrypy.config.get
-        if conf("profiling.on", False):
-            p = getattr(cherrypy, "profiler", None)
-            if p is None:
-                ppath = conf("profiling.path", "")
-                p = cherrypy.profiler = profiler.Profiler(ppath)
-            cherrypy.profiler.run(self._run)
-        else:
-            self._run()
-        
-        if self.method == "HEAD":
-            # HEAD requests MUST NOT return a message-body in the response.
-            cherrypy.response.body = []
-        
-        log_access = cherrypy.config.get("log_access", cherrypy.log_access)
-        if log_access:
-            log_access()
-        
-        return cherrypy.response
-    
-    def _run(self):
-        try:
-            self.process_request_line()
@@ -198 +176 @@
-                raise
-            self.handle_error(sys.exc_info())
+        
+        if self.method == "HEAD":
+            # HEAD requests MUST NOT return a message-body in the response.
+            cherrypy.response.body = []
+        
+        log_access = cherrypy.config.get("log_access", cherrypy.log_access)
+        if log_access:
+            log_access()
+        
+        return cherrypy.response
-    
-    def respond(self, path_info):

trunk/cherrypy/lib/profiler.py

@@ -78 +78 @@
-        path = os.path.join(self.path, "cp_%04d.prof" % self.count)
-        prof = profile.Profile()
-
+result = 
-        prof.dump_stats(path)
+        return result
-    
-    def statfiles(self):
@@ -128 +129 @@
-
-
+class make_app:
+    def __init__(self, nextapp, path=None):
+        """Make a WSGI middleware app which wraps 'nextapp' with profiling."""
+        self.nextapp = nextapp
+        self.profiler = Profiler(path)
+    
+    def __call__(self, environ, start_response):
+        def gather():
+            result = []
+            for line in self.nextapp(environ, start_response):
+                result.append(line)
+            return result
+        return self.profiler.run(gather)
+
+
-def serve(path=None, port=8080):
-    import cherrypy

trunk/cherrypy/test/helper.py

@@ -24 +24 @@
-
-import cherrypy
-
+, profiler
-import webtest
-
@@ -122 +122 @@
-            if base == "/":
-                base = ""
-
+
+
+
+
-##            # We could use the following line, but it breaks test_tutorials
-##            apps.append((base, _cpwsgi.make_app(app)))