Merge lp:~abentley/launchpad/callgrind into lp:launchpad

[Aaron Bentley]

Support callgrind output for script profiling.

= Summary =
Support callgrind output for script profiling.

== Proposed fix ==
When the filename given to --profile begins with "callgrind.out", use callgrind format.

== Pre-implementation notes ==
None

== Implementation details ==
None

== Tests ==
None

== Demo and Q/A ==
None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/services/scripts/base.py

[Jelmer Vernooij (jelmer)]

Nice!

It would be nice to have some sort of smoke test to make sure nobody accidentally breaks this. Other than that, seems good to me.

[Richard Harding (rharding)]

review: Approve (code*)

[j.c.sackett (jcsackett)]

This looks like a clear improvement. Thanks, Aaron.

review: Approve

[Aaron Bentley (abentley)]

lifeless did not approve a LOC waiver for this.

Unmerged revisions

14786. By Aaron Bentley on 2012-02-22

Provide lsprof via a lower level.

14785. By Aaron Bentley on 2012-02-22

Merged stable into callgrind.

14784. By Aaron Bentley on 2012-02-13

Support callgrind.out profiling.

=== modified file 'lib/lp/services/scripts/base.py'
--- lib/lp/services/scripts/base.py	2012-01-06 11:08:30 +0000
+++ lib/lp/services/scripts/base.py	2012-02-22 22:10:26 +0000
@@ -25,6 +25,7 @@
     urlopen,
     )
 
+from bzrlib import lsprof
 from contrib.glock import (
     GlobalLock,
     LockAlreadyAcquired,
@@ -191,8 +192,9 @@
             scripts.logger_options(self.parser, default=self.loglevel)
             self.parser.add_option(
                 '--profile', dest='profile', metavar='FILE', help=(
-                        "Run the script under the profiler and save the "
-                        "profiling stats in FILE."))
+                        'Run the script under the profiler and save the '
+                        'profiling stats in FILE.  If FILE begins with '
+                        '"callgrind.out", the callgrind format is used.'))
         else:
             scripts.dummy_logger_options(self.parser)
 
@@ -349,7 +351,13 @@
         finally:
             install_feature_controller(original_feature_controller)
         if profiler:
-            profiler.dump_stats(self.options.profile)
+            basename = os.path.basename(self.options.profile)
+            if not basename.startswith('callgrind.out'):
+                profiler.dump_stats(self.options.profile)
+            else:
+                stats = lsprof.Stats(
+                    profiler.getstats(), {})
+                stats.save(self.options.profile, 'callgrind')
 
     def _init_zca(self, use_web_security):
         """Initialize the ZCA, this can be overridden for testing purposes."""