Mercurial > hg
annotate mercurial/profiling.py @ 42437:9609430d3625
rust-filepatterns: use bytes instead of String
In my initial patch, I introduced an unnecessary hard constraint on UTF-8
filenames and patterns which I forgot to remove. Although the performance
penalty for using String might be negligible, we don't want to break
compatibility with non-UTF-8 encodings for no reason.
Moreover, this change allows for a cleaner Rust core API.
This patch introduces a new utils module that is used with this fix.
Finally, PatternError was not put inside the Python module generated by
Rust, which would have raised a NameError.
Differential Revision: https://phab.mercurial-scm.org/D6485
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Thu, 06 Jun 2019 15:30:56 +0200 |
parents | 0ae593e791fb |
children | 2372284d9457 |
rev | line source |
---|---|
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 # profiling.py - profiling functions |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 # |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
3 # Copyright 2016 Gregory Szorc <gregory.szorc@gmail.com> |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
4 # |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
6 # GNU General Public License version 2 or any later version. |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
7 |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
8 from __future__ import absolute_import, print_function |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
9 |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
10 import contextlib |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
11 |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
12 from .i18n import _ |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
13 from . import ( |
30820
6a70cf94d1b5
py3: replace pycompat.getenv with encoding.environ.get
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30664
diff
changeset
|
14 encoding, |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
15 error, |
32417
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
16 extensions, |
36683
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
17 pycompat, |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
18 util, |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
19 ) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
20 |
32417
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
21 def _loadprofiler(ui, profiler): |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
22 """load profiler extension. return profile method, or None on failure""" |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
23 extname = profiler |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
24 extensions.loadall(ui, whitelist=[extname]) |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
25 try: |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
26 mod = extensions.find(extname) |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
27 except KeyError: |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
28 return None |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
29 else: |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
30 return getattr(mod, 'profile', None) |
f40dc6f7c12f
profiling: allow loading profiling extension before everything else
Jun Wu <quark@fb.com>
parents:
30975
diff
changeset
|
31 |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
32 @contextlib.contextmanager |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
33 def lsprofile(ui, fp): |
33499
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
34 format = ui.config('profiling', 'format') |
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
35 field = ui.config('profiling', 'sort') |
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
36 limit = ui.configint('profiling', 'limit') |
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
37 climit = ui.configint('profiling', 'nested') |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
38 |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
39 if format not in ['text', 'kcachegrind']: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
40 ui.warn(_("unrecognized profiling format '%s'" |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
41 " - Ignored\n") % format) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
42 format = 'text' |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
43 |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
44 try: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
45 from . import lsprof |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
46 except ImportError: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
47 raise error.Abort(_( |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
48 'lsprof not available - install from ' |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
49 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
50 p = lsprof.Profiler() |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
51 p.enable(subcalls=True) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
52 try: |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
53 yield |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
54 finally: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
55 p.disable() |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
56 |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
57 if format == 'kcachegrind': |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
58 from . import lsprofcalltree |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
59 calltree = lsprofcalltree.KCacheGrind(p) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
60 calltree.output(fp) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
61 else: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
62 # format == 'text' |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
63 stats = lsprof.Stats(p.getstats()) |
40192
b8f6a99ad89b
py3: convert sorting field to sysstr
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38260
diff
changeset
|
64 stats.sort(pycompat.sysstr(field)) |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
65 stats.pprint(limit=limit, file=fp, climit=climit) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
66 |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
67 @contextlib.contextmanager |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
68 def flameprofile(ui, fp): |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
69 try: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
70 from flamegraph import flamegraph |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
71 except ImportError: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
72 raise error.Abort(_( |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
73 'flamegraph not available - install from ' |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
74 'https://github.com/evanhempel/python-flamegraph')) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
75 # developer config: profiling.freq |
33499
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
76 freq = ui.configint('profiling', 'freq') |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
77 filter_ = None |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
78 collapse_recursion = True |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
79 thread = flamegraph.ProfileThread(fp, 1.0 / freq, |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
80 filter_, collapse_recursion) |
30975
22fbca1d11ed
mercurial: switch to util.timer for all interval timings
Simon Farnsworth <simonfar@fb.com>
parents:
30930
diff
changeset
|
81 start_time = util.timer() |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
82 try: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
83 thread.start() |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
84 yield |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
85 finally: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
86 thread.stop() |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
87 thread.join() |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
88 print('Collected %d stack frames (%d unique) in %2.2f seconds.' % ( |
30975
22fbca1d11ed
mercurial: switch to util.timer for all interval timings
Simon Farnsworth <simonfar@fb.com>
parents:
30930
diff
changeset
|
89 util.timer() - start_time, thread.num_frames(), |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
90 thread.num_frames(unique=True))) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
91 |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
92 @contextlib.contextmanager |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
93 def statprofile(ui, fp): |
30316
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
94 from . import statprof |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
95 |
33499
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
96 freq = ui.configint('profiling', 'freq') |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
97 if freq > 0: |
29785
88d3c1ab03a7
profiling: don't error with statprof when profiling has already started
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29784
diff
changeset
|
98 # Cannot reset when profiler is already active. So silently no-op. |
88d3c1ab03a7
profiling: don't error with statprof when profiling has already started
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29784
diff
changeset
|
99 if statprof.state.profile_level == 0: |
88d3c1ab03a7
profiling: don't error with statprof when profiling has already started
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29784
diff
changeset
|
100 statprof.reset(freq) |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
101 else: |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
102 ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq) |
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
103 |
40418
89703e6151e7
profiling: revert the default mode back to 'cpu' on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40192
diff
changeset
|
104 track = ui.config('profiling', 'time-track', |
89703e6151e7
profiling: revert the default mode back to 'cpu' on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40192
diff
changeset
|
105 pycompat.iswindows and 'cpu' or 'real') |
38260
15a1e37f80bd
profiling: introduce a "profiling.time-track" option
Boris Feld <boris.feld@octobus.net>
parents:
36683
diff
changeset
|
106 statprof.start(mechanism='thread', track=track) |
30316
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
107 |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
108 try: |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
109 yield |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
110 finally: |
30316
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
111 data = statprof.stop() |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
112 |
33499
0407a51b9d8c
codemod: register core configitems using a script
Jun Wu <quark@fb.com>
parents:
33195
diff
changeset
|
113 profformat = ui.config('profiling', 'statformat') |
30316
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
114 |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
115 formats = { |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
116 'byline': statprof.DisplayFormats.ByLine, |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
117 'bymethod': statprof.DisplayFormats.ByMethod, |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
118 'hotpath': statprof.DisplayFormats.Hotpath, |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
119 'json': statprof.DisplayFormats.Json, |
30930
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
120 'chrome': statprof.DisplayFormats.Chrome, |
30316
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
121 } |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
122 |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
123 if profformat in formats: |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
124 displayformat = formats[profformat] |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
125 else: |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
126 ui.warn(_('unknown profiler output format: %s\n') % profformat) |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
127 displayformat = statprof.DisplayFormats.Hotpath |
faf1b8923da2
profiling: use vendored statprof and upstream enhancements (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29785
diff
changeset
|
128 |
30930
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
129 kwargs = {} |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
130 |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
131 def fraction(s): |
32978
41b081ac2145
profiling: cope with configwith default value handling changes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32851
diff
changeset
|
132 if isinstance(s, (float, int)): |
41b081ac2145
profiling: cope with configwith default value handling changes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32851
diff
changeset
|
133 return float(s) |
30930
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
134 if s.endswith('%'): |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
135 v = float(s[:-1]) / 100 |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
136 else: |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
137 v = float(s) |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
138 if 0 <= v <= 1: |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
139 return v |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
140 raise ValueError(s) |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
141 |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
142 if profformat == 'chrome': |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
143 showmin = ui.configwith(fraction, 'profiling', 'showmin', 0.005) |
34410
fecea78ff2af
configitems: register the 'profiling.showmax' config
Boris Feld <boris.feld@octobus.net>
parents:
33499
diff
changeset
|
144 showmax = ui.configwith(fraction, 'profiling', 'showmax') |
30930
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
145 kwargs.update(minthreshold=showmin, maxthreshold=showmax) |
32851
cb6436e051ca
profiling: allow configuring minimum display threshold for hotpath
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32810
diff
changeset
|
146 elif profformat == 'hotpath': |
33195
5d8942dbe49e
check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32978
diff
changeset
|
147 # inconsistent config: profiling.showmin |
32851
cb6436e051ca
profiling: allow configuring minimum display threshold for hotpath
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32810
diff
changeset
|
148 limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05) |
36400
7b86aa31b004
py3: fix handling of keyword arguments at more places
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34412
diff
changeset
|
149 kwargs[r'limit'] = limit |
42423
0ae593e791fb
profiling: show actual time spent in hotpath display
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
40418
diff
changeset
|
150 showtime = ui.configbool('profiling', 'showtime') |
0ae593e791fb
profiling: show actual time spent in hotpath display
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
40418
diff
changeset
|
151 kwargs[r'showtime'] = showtime |
30930
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
152 |
517bc1cd7033
profiling: add statprof support for Chrome trace viewer rendering
Bryan O'Sullivan <bryano@fb.com>
parents:
30820
diff
changeset
|
153 statprof.display(fp, data=data, format=displayformat, **kwargs) |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
154 |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
155 class profile(object): |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
156 """Start profiling. |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
157 |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
158 Profiling is active when the context manager is active. When the context |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
159 manager exits, profiling results will be written to the configured output. |
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
160 """ |
32785
37ec8f24d912
profile: introduce a knob to control if the context is actually profiling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32784
diff
changeset
|
161 def __init__(self, ui, enabled=True): |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
162 self._ui = ui |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
163 self._output = None |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
164 self._fp = None |
32805
2b0fc56840d0
profile: use explicit logic to control file closing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32804
diff
changeset
|
165 self._fpdoclose = True |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
166 self._profiler = None |
32785
37ec8f24d912
profile: introduce a knob to control if the context is actually profiling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32784
diff
changeset
|
167 self._enabled = enabled |
32784
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
168 self._entered = False |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
169 self._started = False |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
170 |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
171 def __enter__(self): |
32784
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
172 self._entered = True |
32785
37ec8f24d912
profile: introduce a knob to control if the context is actually profiling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32784
diff
changeset
|
173 if self._enabled: |
37ec8f24d912
profile: introduce a knob to control if the context is actually profiling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32784
diff
changeset
|
174 self.start() |
32786
0ead06d54ffe
profile: make the contextmanager object available to the callers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32785
diff
changeset
|
175 return self |
32784
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
176 |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
177 def start(self): |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
178 """Start profiling. |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
179 |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
180 The profiling will stop at the context exit. |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
181 |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
182 If the profiler was already started, this has no effect.""" |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
183 if not self._entered: |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
184 raise error.ProgrammingError() |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
185 if self._started: |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
186 return |
086c1ef0f666
profile: introduce a "start" method to the profile context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32783
diff
changeset
|
187 self._started = True |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
188 profiler = encoding.environ.get('HGPROF') |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
189 proffn = None |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
190 if profiler is None: |
34412
83dfbda40e67
configitems: register the 'profiling.type' config
Boris Feld <boris.feld@octobus.net>
parents:
34410
diff
changeset
|
191 profiler = self._ui.config('profiling', 'type') |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
192 if profiler not in ('ls', 'stat', 'flame'): |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
193 # try load profiler from extension with the same name |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
194 proffn = _loadprofiler(self._ui, profiler) |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
195 if proffn is None: |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
196 self._ui.warn(_("unrecognized profiler '%s' - ignored\n") |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
197 % profiler) |
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
198 profiler = 'stat' |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
199 |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
200 self._output = self._ui.config('profiling', 'output') |
29781
2654a0aac80d
profiling: move profiling code from dispatch.py (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
201 |
32808
336700745a5c
profile: close 'fp' on error within '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32807
diff
changeset
|
202 try: |
32807
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
203 if self._output == 'blackbox': |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
204 self._fp = util.stringio() |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
205 elif self._output: |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
206 path = self._ui.expandpath(self._output) |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
207 self._fp = open(path, 'wb') |
36683
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
208 elif pycompat.iswindows: |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
209 # parse escape sequence by win32print() |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
210 class uifp(object): |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
211 def __init__(self, ui): |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
212 self._ui = ui |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
213 def write(self, data): |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
214 self._ui.write_err(data) |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
215 def flush(self): |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
216 self._ui.flush() |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
217 self._fpdoclose = False |
e39953fdd924
profile: colorize output on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36400
diff
changeset
|
218 self._fp = uifp(self._ui) |
32807
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
219 else: |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
220 self._fpdoclose = False |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
221 self._fp = self._ui.ferr |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
222 |
32807
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
223 if proffn is not None: |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
224 pass |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
225 elif profiler == 'ls': |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
226 proffn = lsprofile |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
227 elif profiler == 'flame': |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
228 proffn = flameprofile |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
229 else: |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
230 proffn = statprofile |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
231 |
32807
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
232 self._profiler = proffn(self._ui, self._fp) |
54b356d65079
profile: indent part of '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32806
diff
changeset
|
233 self._profiler.__enter__() |
32808
336700745a5c
profile: close 'fp' on error within '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32807
diff
changeset
|
234 except: # re-raises |
336700745a5c
profile: close 'fp' on error within '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32807
diff
changeset
|
235 self._closefp() |
336700745a5c
profile: close 'fp' on error within '__enter__'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32807
diff
changeset
|
236 raise |
29783
5d44197c208b
profiling: make profiling functions context managers (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29781
diff
changeset
|
237 |
32783
4483696dacee
profile: upgrade the "profile" context manager to a full class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32417
diff
changeset
|
238 def __exit__(self, exception_type, exception_value, traceback): |
32810
6675d23da748
profile: properly propagate exception from the sub-context manager
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32809
diff
changeset
|
239 propagate = None |
32809
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
240 if self._profiler is not None: |
32810
6675d23da748
profile: properly propagate exception from the sub-context manager
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32809
diff
changeset
|
241 propagate = self._profiler.__exit__(exception_type, exception_value, |
6675d23da748
profile: properly propagate exception from the sub-context manager
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32809
diff
changeset
|
242 traceback) |
32809
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
243 if self._output == 'blackbox': |
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
244 val = 'Profile:\n%s' % self._fp.getvalue() |
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
245 # ui.log treats the input as a format string, |
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
246 # so we need to escape any % signs. |
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
247 val = val.replace('%', '%%') |
062eb859d3ee
profile: close 'fp' in all cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32808
diff
changeset
|
248 self._ui.log('profile', val) |
32806
3a4c677cbd6e
profile: remove now useless indent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32805
diff
changeset
|
249 self._closefp() |
32810
6675d23da748
profile: properly propagate exception from the sub-context manager
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32809
diff
changeset
|
250 return propagate |
32804
c0b2c8f25ad9
profiling: move 'fp' closing logic into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32788
diff
changeset
|
251 |
c0b2c8f25ad9
profiling: move 'fp' closing logic into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32788
diff
changeset
|
252 def _closefp(self): |
32805
2b0fc56840d0
profile: use explicit logic to control file closing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32804
diff
changeset
|
253 if self._fpdoclose and self._fp is not None: |
2b0fc56840d0
profile: use explicit logic to control file closing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32804
diff
changeset
|
254 self._fp.close() |