Changeset 1194

Timestamp:

07/10/06 13:24:52

Author:

fumanchu

Message:

New ProfileAggregator? class.

Files:

• trunk/cherrypy/lib/profiler.py (modified) (4 diffs)
• trunk/cherrypy/test/helper.py (modified) (1 diff)

trunk/cherrypy/lib/profiler.py

@@ -21 +21 @@
-
-
+You can also turn on profiling for all requests
+using the make_app function as WSGI middleware.
+
+
-CherryPy developers
-===================
-
- to get a
-
-profiling.on = True" to turn on profiling
+
+
+--profile" flag when running the test suite
-function to browse the results in a web browser. If you run this
-module from the command line, it will call serve() for you.
@@ -63 +67 @@
-
-
+_count = 0
+
-class Profiler(object):
-    
@@ -71 +77 @@
-        if not os.path.exists(path):
-            os.makedirs(path)
-        self.count = 0
-    
-    def run(self, func, *args):
-        """run(func, *args). Run func, dumping profile data into self.path."""
-
-
+
+
+
-        prof = profile.Profile()
-        result = prof.runcall(func, *args)
@@ -129 +135 @@
-
-
+class ProfileAggregator(Profiler):
+    
+    def __init__(self, path=None):
+        Profiler.__init__(self, path)
+        global _count
+        self.count = _count = _count + 1
+        self.profiler = profile.Profile()
+    
+    def run(self, func, *args):
+        path = os.path.join(self.path, "cp_%04d.prof" % self.count)
+        result = self.profiler.runcall(func, *args)
+        self.profiler.dump_stats(path)
+        return result
+
+
-class make_app:
-
+, aggregate=False
-        """Make a WSGI middleware app which wraps 'nextapp' with profiling."""
-        self.nextapp = nextapp
-
+
+
+
+
+
-    
-    def __call__(self, environ, start_response):

trunk/cherrypy/test/helper.py

@@ -124 +124 @@
-            if conf.get("profiling.on", False):
-                apps.append((base, profiler.make_app(_cpwsgi.wsgiApp)))
+##                apps.append((base, profiler.make_app(_cpwsgi.wsgiApp, aggregate=True)))
-            else:
-                apps.append((base, _cpwsgi.wsgiApp))