Show More
@@ -1,3778 +1,3778 b'' | |||||
1 | # perf.py - performance test routines |
|
1 | # perf.py - performance test routines | |
2 | '''helper extension to measure performance |
|
2 | '''helper extension to measure performance | |
3 |
|
3 | |||
4 | Configurations |
|
4 | Configurations | |
5 | ============== |
|
5 | ============== | |
6 |
|
6 | |||
7 | ``perf`` |
|
7 | ``perf`` | |
8 | -------- |
|
8 | -------- | |
9 |
|
9 | |||
10 | ``all-timing`` |
|
10 | ``all-timing`` | |
11 | When set, additional statistics will be reported for each benchmark: best, |
|
11 | When set, additional statistics will be reported for each benchmark: best, | |
12 | worst, median average. If not set only the best timing is reported |
|
12 | worst, median average. If not set only the best timing is reported | |
13 | (default: off). |
|
13 | (default: off). | |
14 |
|
14 | |||
15 | ``presleep`` |
|
15 | ``presleep`` | |
16 | number of second to wait before any group of runs (default: 1) |
|
16 | number of second to wait before any group of runs (default: 1) | |
17 |
|
17 | |||
18 | ``pre-run`` |
|
18 | ``pre-run`` | |
19 | number of run to perform before starting measurement. |
|
19 | number of run to perform before starting measurement. | |
20 |
|
20 | |||
21 | ``profile-benchmark`` |
|
21 | ``profile-benchmark`` | |
22 | Enable profiling for the benchmarked section. |
|
22 | Enable profiling for the benchmarked section. | |
23 | (The first iteration is benchmarked) |
|
23 | (The first iteration is benchmarked) | |
24 |
|
24 | |||
25 | ``run-limits`` |
|
25 | ``run-limits`` | |
26 | Control the number of runs each benchmark will perform. The option value |
|
26 | Control the number of runs each benchmark will perform. The option value | |
27 | should be a list of `<time>-<numberofrun>` pairs. After each run the |
|
27 | should be a list of `<time>-<numberofrun>` pairs. After each run the | |
28 | conditions are considered in order with the following logic: |
|
28 | conditions are considered in order with the following logic: | |
29 |
|
29 | |||
30 | If benchmark has been running for <time> seconds, and we have performed |
|
30 | If benchmark has been running for <time> seconds, and we have performed | |
31 | <numberofrun> iterations, stop the benchmark, |
|
31 | <numberofrun> iterations, stop the benchmark, | |
32 |
|
32 | |||
33 | The default value is: `3.0-100, 10.0-3` |
|
33 | The default value is: `3.0-100, 10.0-3` | |
34 |
|
34 | |||
35 | ``stub`` |
|
35 | ``stub`` | |
36 | When set, benchmarks will only be run once, useful for testing |
|
36 | When set, benchmarks will only be run once, useful for testing | |
37 | (default: off) |
|
37 | (default: off) | |
38 | ''' |
|
38 | ''' | |
39 |
|
39 | |||
40 | # "historical portability" policy of perf.py: |
|
40 | # "historical portability" policy of perf.py: | |
41 | # |
|
41 | # | |
42 | # We have to do: |
|
42 | # We have to do: | |
43 | # - make perf.py "loadable" with as wide Mercurial version as possible |
|
43 | # - make perf.py "loadable" with as wide Mercurial version as possible | |
44 | # This doesn't mean that perf commands work correctly with that Mercurial. |
|
44 | # This doesn't mean that perf commands work correctly with that Mercurial. | |
45 | # BTW, perf.py itself has been available since 1.1 (or eb240755386d). |
|
45 | # BTW, perf.py itself has been available since 1.1 (or eb240755386d). | |
46 | # - make historical perf command work correctly with as wide Mercurial |
|
46 | # - make historical perf command work correctly with as wide Mercurial | |
47 | # version as possible |
|
47 | # version as possible | |
48 | # |
|
48 | # | |
49 | # We have to do, if possible with reasonable cost: |
|
49 | # We have to do, if possible with reasonable cost: | |
50 | # - make recent perf command for historical feature work correctly |
|
50 | # - make recent perf command for historical feature work correctly | |
51 | # with early Mercurial |
|
51 | # with early Mercurial | |
52 | # |
|
52 | # | |
53 | # We don't have to do: |
|
53 | # We don't have to do: | |
54 | # - make perf command for recent feature work correctly with early |
|
54 | # - make perf command for recent feature work correctly with early | |
55 | # Mercurial |
|
55 | # Mercurial | |
56 |
|
56 | |||
57 | from __future__ import absolute_import |
|
57 | from __future__ import absolute_import | |
58 | import contextlib |
|
58 | import contextlib | |
59 | import functools |
|
59 | import functools | |
60 | import gc |
|
60 | import gc | |
61 | import os |
|
61 | import os | |
62 | import random |
|
62 | import random | |
63 | import shutil |
|
63 | import shutil | |
64 | import struct |
|
64 | import struct | |
65 | import sys |
|
65 | import sys | |
66 | import tempfile |
|
66 | import tempfile | |
67 | import threading |
|
67 | import threading | |
68 | import time |
|
68 | import time | |
69 | from mercurial import ( |
|
69 | from mercurial import ( | |
70 | changegroup, |
|
70 | changegroup, | |
71 | cmdutil, |
|
71 | cmdutil, | |
72 | commands, |
|
72 | commands, | |
73 | copies, |
|
73 | copies, | |
74 | error, |
|
74 | error, | |
75 | extensions, |
|
75 | extensions, | |
76 | hg, |
|
76 | hg, | |
77 | mdiff, |
|
77 | mdiff, | |
78 | merge, |
|
78 | merge, | |
79 | revlog, |
|
79 | revlog, | |
80 | util, |
|
80 | util, | |
81 | ) |
|
81 | ) | |
82 |
|
82 | |||
83 | # for "historical portability": |
|
83 | # for "historical portability": | |
84 | # try to import modules separately (in dict order), and ignore |
|
84 | # try to import modules separately (in dict order), and ignore | |
85 | # failure, because these aren't available with early Mercurial |
|
85 | # failure, because these aren't available with early Mercurial | |
86 | try: |
|
86 | try: | |
87 | from mercurial import branchmap # since 2.5 (or bcee63733aad) |
|
87 | from mercurial import branchmap # since 2.5 (or bcee63733aad) | |
88 | except ImportError: |
|
88 | except ImportError: | |
89 | pass |
|
89 | pass | |
90 | try: |
|
90 | try: | |
91 | from mercurial import obsolete # since 2.3 (or ad0d6c2b3279) |
|
91 | from mercurial import obsolete # since 2.3 (or ad0d6c2b3279) | |
92 | except ImportError: |
|
92 | except ImportError: | |
93 | pass |
|
93 | pass | |
94 | try: |
|
94 | try: | |
95 | from mercurial import registrar # since 3.7 (or 37d50250b696) |
|
95 | from mercurial import registrar # since 3.7 (or 37d50250b696) | |
96 |
|
96 | |||
97 | dir(registrar) # forcibly load it |
|
97 | dir(registrar) # forcibly load it | |
98 | except ImportError: |
|
98 | except ImportError: | |
99 | registrar = None |
|
99 | registrar = None | |
100 | try: |
|
100 | try: | |
101 | from mercurial import repoview # since 2.5 (or 3a6ddacb7198) |
|
101 | from mercurial import repoview # since 2.5 (or 3a6ddacb7198) | |
102 | except ImportError: |
|
102 | except ImportError: | |
103 | pass |
|
103 | pass | |
104 | try: |
|
104 | try: | |
105 | from mercurial.utils import repoviewutil # since 5.0 |
|
105 | from mercurial.utils import repoviewutil # since 5.0 | |
106 | except ImportError: |
|
106 | except ImportError: | |
107 | repoviewutil = None |
|
107 | repoviewutil = None | |
108 | try: |
|
108 | try: | |
109 | from mercurial import scmutil # since 1.9 (or 8b252e826c68) |
|
109 | from mercurial import scmutil # since 1.9 (or 8b252e826c68) | |
110 | except ImportError: |
|
110 | except ImportError: | |
111 | pass |
|
111 | pass | |
112 | try: |
|
112 | try: | |
113 | from mercurial import setdiscovery # since 1.9 (or cb98fed52495) |
|
113 | from mercurial import setdiscovery # since 1.9 (or cb98fed52495) | |
114 | except ImportError: |
|
114 | except ImportError: | |
115 | pass |
|
115 | pass | |
116 |
|
116 | |||
117 | try: |
|
117 | try: | |
118 | from mercurial import profiling |
|
118 | from mercurial import profiling | |
119 | except ImportError: |
|
119 | except ImportError: | |
120 | profiling = None |
|
120 | profiling = None | |
121 |
|
121 | |||
122 |
|
122 | |||
123 | def identity(a): |
|
123 | def identity(a): | |
124 | return a |
|
124 | return a | |
125 |
|
125 | |||
126 |
|
126 | |||
127 | try: |
|
127 | try: | |
128 | from mercurial import pycompat |
|
128 | from mercurial import pycompat | |
129 |
|
129 | |||
130 | getargspec = pycompat.getargspec # added to module after 4.5 |
|
130 | getargspec = pycompat.getargspec # added to module after 4.5 | |
131 | _byteskwargs = pycompat.byteskwargs # since 4.1 (or fbc3f73dc802) |
|
131 | _byteskwargs = pycompat.byteskwargs # since 4.1 (or fbc3f73dc802) | |
132 | _sysstr = pycompat.sysstr # since 4.0 (or 2219f4f82ede) |
|
132 | _sysstr = pycompat.sysstr # since 4.0 (or 2219f4f82ede) | |
133 | _bytestr = pycompat.bytestr # since 4.2 (or b70407bd84d5) |
|
133 | _bytestr = pycompat.bytestr # since 4.2 (or b70407bd84d5) | |
134 | _xrange = pycompat.xrange # since 4.8 (or 7eba8f83129b) |
|
134 | _xrange = pycompat.xrange # since 4.8 (or 7eba8f83129b) | |
135 | fsencode = pycompat.fsencode # since 3.9 (or f4a5e0e86a7e) |
|
135 | fsencode = pycompat.fsencode # since 3.9 (or f4a5e0e86a7e) | |
136 | if pycompat.ispy3: |
|
136 | if pycompat.ispy3: | |
137 | _maxint = sys.maxsize # per py3 docs for replacing maxint |
|
137 | _maxint = sys.maxsize # per py3 docs for replacing maxint | |
138 | else: |
|
138 | else: | |
139 | _maxint = sys.maxint |
|
139 | _maxint = sys.maxint | |
140 | except (NameError, ImportError, AttributeError): |
|
140 | except (NameError, ImportError, AttributeError): | |
141 | import inspect |
|
141 | import inspect | |
142 |
|
142 | |||
143 | getargspec = inspect.getargspec |
|
143 | getargspec = inspect.getargspec | |
144 | _byteskwargs = identity |
|
144 | _byteskwargs = identity | |
145 | _bytestr = str |
|
145 | _bytestr = str | |
146 | fsencode = identity # no py3 support |
|
146 | fsencode = identity # no py3 support | |
147 | _maxint = sys.maxint # no py3 support |
|
147 | _maxint = sys.maxint # no py3 support | |
148 | _sysstr = lambda x: x # no py3 support |
|
148 | _sysstr = lambda x: x # no py3 support | |
149 | _xrange = xrange |
|
149 | _xrange = xrange | |
150 |
|
150 | |||
151 | try: |
|
151 | try: | |
152 | # 4.7+ |
|
152 | # 4.7+ | |
153 | queue = pycompat.queue.Queue |
|
153 | queue = pycompat.queue.Queue | |
154 | except (NameError, AttributeError, ImportError): |
|
154 | except (NameError, AttributeError, ImportError): | |
155 | # <4.7. |
|
155 | # <4.7. | |
156 | try: |
|
156 | try: | |
157 | queue = pycompat.queue |
|
157 | queue = pycompat.queue | |
158 | except (NameError, AttributeError, ImportError): |
|
158 | except (NameError, AttributeError, ImportError): | |
159 | import Queue as queue |
|
159 | import Queue as queue | |
160 |
|
160 | |||
161 | try: |
|
161 | try: | |
162 | from mercurial import logcmdutil |
|
162 | from mercurial import logcmdutil | |
163 |
|
163 | |||
164 | makelogtemplater = logcmdutil.maketemplater |
|
164 | makelogtemplater = logcmdutil.maketemplater | |
165 | except (AttributeError, ImportError): |
|
165 | except (AttributeError, ImportError): | |
166 | try: |
|
166 | try: | |
167 | makelogtemplater = cmdutil.makelogtemplater |
|
167 | makelogtemplater = cmdutil.makelogtemplater | |
168 | except (AttributeError, ImportError): |
|
168 | except (AttributeError, ImportError): | |
169 | makelogtemplater = None |
|
169 | makelogtemplater = None | |
170 |
|
170 | |||
171 | # for "historical portability": |
|
171 | # for "historical portability": | |
172 | # define util.safehasattr forcibly, because util.safehasattr has been |
|
172 | # define util.safehasattr forcibly, because util.safehasattr has been | |
173 | # available since 1.9.3 (or 94b200a11cf7) |
|
173 | # available since 1.9.3 (or 94b200a11cf7) | |
174 | _undefined = object() |
|
174 | _undefined = object() | |
175 |
|
175 | |||
176 |
|
176 | |||
177 | def safehasattr(thing, attr): |
|
177 | def safehasattr(thing, attr): | |
178 | return getattr(thing, _sysstr(attr), _undefined) is not _undefined |
|
178 | return getattr(thing, _sysstr(attr), _undefined) is not _undefined | |
179 |
|
179 | |||
180 |
|
180 | |||
181 | setattr(util, 'safehasattr', safehasattr) |
|
181 | setattr(util, 'safehasattr', safehasattr) | |
182 |
|
182 | |||
183 | # for "historical portability": |
|
183 | # for "historical portability": | |
184 | # define util.timer forcibly, because util.timer has been available |
|
184 | # define util.timer forcibly, because util.timer has been available | |
185 | # since ae5d60bb70c9 |
|
185 | # since ae5d60bb70c9 | |
186 | if safehasattr(time, 'perf_counter'): |
|
186 | if safehasattr(time, 'perf_counter'): | |
187 | util.timer = time.perf_counter |
|
187 | util.timer = time.perf_counter | |
188 | elif os.name == b'nt': |
|
188 | elif os.name == b'nt': | |
189 | util.timer = time.clock |
|
189 | util.timer = time.clock | |
190 | else: |
|
190 | else: | |
191 | util.timer = time.time |
|
191 | util.timer = time.time | |
192 |
|
192 | |||
193 | # for "historical portability": |
|
193 | # for "historical portability": | |
194 | # use locally defined empty option list, if formatteropts isn't |
|
194 | # use locally defined empty option list, if formatteropts isn't | |
195 | # available, because commands.formatteropts has been available since |
|
195 | # available, because commands.formatteropts has been available since | |
196 | # 3.2 (or 7a7eed5176a4), even though formatting itself has been |
|
196 | # 3.2 (or 7a7eed5176a4), even though formatting itself has been | |
197 | # available since 2.2 (or ae5f92e154d3) |
|
197 | # available since 2.2 (or ae5f92e154d3) | |
198 | formatteropts = getattr( |
|
198 | formatteropts = getattr( | |
199 | cmdutil, "formatteropts", getattr(commands, "formatteropts", []) |
|
199 | cmdutil, "formatteropts", getattr(commands, "formatteropts", []) | |
200 | ) |
|
200 | ) | |
201 |
|
201 | |||
202 | # for "historical portability": |
|
202 | # for "historical portability": | |
203 | # use locally defined option list, if debugrevlogopts isn't available, |
|
203 | # use locally defined option list, if debugrevlogopts isn't available, | |
204 | # because commands.debugrevlogopts has been available since 3.7 (or |
|
204 | # because commands.debugrevlogopts has been available since 3.7 (or | |
205 | # 5606f7d0d063), even though cmdutil.openrevlog() has been available |
|
205 | # 5606f7d0d063), even though cmdutil.openrevlog() has been available | |
206 | # since 1.9 (or a79fea6b3e77). |
|
206 | # since 1.9 (or a79fea6b3e77). | |
207 | revlogopts = getattr( |
|
207 | revlogopts = getattr( | |
208 | cmdutil, |
|
208 | cmdutil, | |
209 | "debugrevlogopts", |
|
209 | "debugrevlogopts", | |
210 | getattr( |
|
210 | getattr( | |
211 | commands, |
|
211 | commands, | |
212 | "debugrevlogopts", |
|
212 | "debugrevlogopts", | |
213 | [ |
|
213 | [ | |
214 | (b'c', b'changelog', False, b'open changelog'), |
|
214 | (b'c', b'changelog', False, b'open changelog'), | |
215 | (b'm', b'manifest', False, b'open manifest'), |
|
215 | (b'm', b'manifest', False, b'open manifest'), | |
216 | (b'', b'dir', False, b'open directory manifest'), |
|
216 | (b'', b'dir', False, b'open directory manifest'), | |
217 | ], |
|
217 | ], | |
218 | ), |
|
218 | ), | |
219 | ) |
|
219 | ) | |
220 |
|
220 | |||
221 | cmdtable = {} |
|
221 | cmdtable = {} | |
222 |
|
222 | |||
223 | # for "historical portability": |
|
223 | # for "historical portability": | |
224 | # define parsealiases locally, because cmdutil.parsealiases has been |
|
224 | # define parsealiases locally, because cmdutil.parsealiases has been | |
225 | # available since 1.5 (or 6252852b4332) |
|
225 | # available since 1.5 (or 6252852b4332) | |
226 | def parsealiases(cmd): |
|
226 | def parsealiases(cmd): | |
227 | return cmd.split(b"|") |
|
227 | return cmd.split(b"|") | |
228 |
|
228 | |||
229 |
|
229 | |||
230 | if safehasattr(registrar, 'command'): |
|
230 | if safehasattr(registrar, 'command'): | |
231 | command = registrar.command(cmdtable) |
|
231 | command = registrar.command(cmdtable) | |
232 | elif safehasattr(cmdutil, 'command'): |
|
232 | elif safehasattr(cmdutil, 'command'): | |
233 | command = cmdutil.command(cmdtable) |
|
233 | command = cmdutil.command(cmdtable) | |
234 | if b'norepo' not in getargspec(command).args: |
|
234 | if b'norepo' not in getargspec(command).args: | |
235 | # for "historical portability": |
|
235 | # for "historical portability": | |
236 | # wrap original cmdutil.command, because "norepo" option has |
|
236 | # wrap original cmdutil.command, because "norepo" option has | |
237 | # been available since 3.1 (or 75a96326cecb) |
|
237 | # been available since 3.1 (or 75a96326cecb) | |
238 | _command = command |
|
238 | _command = command | |
239 |
|
239 | |||
240 | def command(name, options=(), synopsis=None, norepo=False): |
|
240 | def command(name, options=(), synopsis=None, norepo=False): | |
241 | if norepo: |
|
241 | if norepo: | |
242 | commands.norepo += b' %s' % b' '.join(parsealiases(name)) |
|
242 | commands.norepo += b' %s' % b' '.join(parsealiases(name)) | |
243 | return _command(name, list(options), synopsis) |
|
243 | return _command(name, list(options), synopsis) | |
244 |
|
244 | |||
245 |
|
245 | |||
246 | else: |
|
246 | else: | |
247 | # for "historical portability": |
|
247 | # for "historical portability": | |
248 | # define "@command" annotation locally, because cmdutil.command |
|
248 | # define "@command" annotation locally, because cmdutil.command | |
249 | # has been available since 1.9 (or 2daa5179e73f) |
|
249 | # has been available since 1.9 (or 2daa5179e73f) | |
250 | def command(name, options=(), synopsis=None, norepo=False): |
|
250 | def command(name, options=(), synopsis=None, norepo=False): | |
251 | def decorator(func): |
|
251 | def decorator(func): | |
252 | if synopsis: |
|
252 | if synopsis: | |
253 | cmdtable[name] = func, list(options), synopsis |
|
253 | cmdtable[name] = func, list(options), synopsis | |
254 | else: |
|
254 | else: | |
255 | cmdtable[name] = func, list(options) |
|
255 | cmdtable[name] = func, list(options) | |
256 | if norepo: |
|
256 | if norepo: | |
257 | commands.norepo += b' %s' % b' '.join(parsealiases(name)) |
|
257 | commands.norepo += b' %s' % b' '.join(parsealiases(name)) | |
258 | return func |
|
258 | return func | |
259 |
|
259 | |||
260 | return decorator |
|
260 | return decorator | |
261 |
|
261 | |||
262 |
|
262 | |||
263 | try: |
|
263 | try: | |
264 | import mercurial.registrar |
|
264 | import mercurial.registrar | |
265 | import mercurial.configitems |
|
265 | import mercurial.configitems | |
266 |
|
266 | |||
267 | configtable = {} |
|
267 | configtable = {} | |
268 | configitem = mercurial.registrar.configitem(configtable) |
|
268 | configitem = mercurial.registrar.configitem(configtable) | |
269 | configitem( |
|
269 | configitem( | |
270 | b'perf', |
|
270 | b'perf', | |
271 | b'presleep', |
|
271 | b'presleep', | |
272 | default=mercurial.configitems.dynamicdefault, |
|
272 | default=mercurial.configitems.dynamicdefault, | |
273 | experimental=True, |
|
273 | experimental=True, | |
274 | ) |
|
274 | ) | |
275 | configitem( |
|
275 | configitem( | |
276 | b'perf', |
|
276 | b'perf', | |
277 | b'stub', |
|
277 | b'stub', | |
278 | default=mercurial.configitems.dynamicdefault, |
|
278 | default=mercurial.configitems.dynamicdefault, | |
279 | experimental=True, |
|
279 | experimental=True, | |
280 | ) |
|
280 | ) | |
281 | configitem( |
|
281 | configitem( | |
282 | b'perf', |
|
282 | b'perf', | |
283 | b'parentscount', |
|
283 | b'parentscount', | |
284 | default=mercurial.configitems.dynamicdefault, |
|
284 | default=mercurial.configitems.dynamicdefault, | |
285 | experimental=True, |
|
285 | experimental=True, | |
286 | ) |
|
286 | ) | |
287 | configitem( |
|
287 | configitem( | |
288 | b'perf', |
|
288 | b'perf', | |
289 | b'all-timing', |
|
289 | b'all-timing', | |
290 | default=mercurial.configitems.dynamicdefault, |
|
290 | default=mercurial.configitems.dynamicdefault, | |
291 | experimental=True, |
|
291 | experimental=True, | |
292 | ) |
|
292 | ) | |
293 | configitem( |
|
293 | configitem( | |
294 | b'perf', b'pre-run', default=mercurial.configitems.dynamicdefault, |
|
294 | b'perf', b'pre-run', default=mercurial.configitems.dynamicdefault, | |
295 | ) |
|
295 | ) | |
296 | configitem( |
|
296 | configitem( | |
297 | b'perf', |
|
297 | b'perf', | |
298 | b'profile-benchmark', |
|
298 | b'profile-benchmark', | |
299 | default=mercurial.configitems.dynamicdefault, |
|
299 | default=mercurial.configitems.dynamicdefault, | |
300 | ) |
|
300 | ) | |
301 | configitem( |
|
301 | configitem( | |
302 | b'perf', |
|
302 | b'perf', | |
303 | b'run-limits', |
|
303 | b'run-limits', | |
304 | default=mercurial.configitems.dynamicdefault, |
|
304 | default=mercurial.configitems.dynamicdefault, | |
305 | experimental=True, |
|
305 | experimental=True, | |
306 | ) |
|
306 | ) | |
307 | except (ImportError, AttributeError): |
|
307 | except (ImportError, AttributeError): | |
308 | pass |
|
308 | pass | |
309 | except TypeError: |
|
309 | except TypeError: | |
310 | # compatibility fix for a11fd395e83f |
|
310 | # compatibility fix for a11fd395e83f | |
311 | # hg version: 5.2 |
|
311 | # hg version: 5.2 | |
312 | configitem( |
|
312 | configitem( | |
313 | b'perf', b'presleep', default=mercurial.configitems.dynamicdefault, |
|
313 | b'perf', b'presleep', default=mercurial.configitems.dynamicdefault, | |
314 | ) |
|
314 | ) | |
315 | configitem( |
|
315 | configitem( | |
316 | b'perf', b'stub', default=mercurial.configitems.dynamicdefault, |
|
316 | b'perf', b'stub', default=mercurial.configitems.dynamicdefault, | |
317 | ) |
|
317 | ) | |
318 | configitem( |
|
318 | configitem( | |
319 | b'perf', b'parentscount', default=mercurial.configitems.dynamicdefault, |
|
319 | b'perf', b'parentscount', default=mercurial.configitems.dynamicdefault, | |
320 | ) |
|
320 | ) | |
321 | configitem( |
|
321 | configitem( | |
322 | b'perf', b'all-timing', default=mercurial.configitems.dynamicdefault, |
|
322 | b'perf', b'all-timing', default=mercurial.configitems.dynamicdefault, | |
323 | ) |
|
323 | ) | |
324 | configitem( |
|
324 | configitem( | |
325 | b'perf', b'pre-run', default=mercurial.configitems.dynamicdefault, |
|
325 | b'perf', b'pre-run', default=mercurial.configitems.dynamicdefault, | |
326 | ) |
|
326 | ) | |
327 | configitem( |
|
327 | configitem( | |
328 | b'perf', |
|
328 | b'perf', | |
329 | b'profile-benchmark', |
|
329 | b'profile-benchmark', | |
330 | default=mercurial.configitems.dynamicdefault, |
|
330 | default=mercurial.configitems.dynamicdefault, | |
331 | ) |
|
331 | ) | |
332 | configitem( |
|
332 | configitem( | |
333 | b'perf', b'run-limits', default=mercurial.configitems.dynamicdefault, |
|
333 | b'perf', b'run-limits', default=mercurial.configitems.dynamicdefault, | |
334 | ) |
|
334 | ) | |
335 |
|
335 | |||
336 |
|
336 | |||
337 | def getlen(ui): |
|
337 | def getlen(ui): | |
338 | if ui.configbool(b"perf", b"stub", False): |
|
338 | if ui.configbool(b"perf", b"stub", False): | |
339 | return lambda x: 1 |
|
339 | return lambda x: 1 | |
340 | return len |
|
340 | return len | |
341 |
|
341 | |||
342 |
|
342 | |||
343 | class noop(object): |
|
343 | class noop(object): | |
344 | """dummy context manager""" |
|
344 | """dummy context manager""" | |
345 |
|
345 | |||
346 | def __enter__(self): |
|
346 | def __enter__(self): | |
347 | pass |
|
347 | pass | |
348 |
|
348 | |||
349 | def __exit__(self, *args): |
|
349 | def __exit__(self, *args): | |
350 | pass |
|
350 | pass | |
351 |
|
351 | |||
352 |
|
352 | |||
353 | NOOPCTX = noop() |
|
353 | NOOPCTX = noop() | |
354 |
|
354 | |||
355 |
|
355 | |||
356 | def gettimer(ui, opts=None): |
|
356 | def gettimer(ui, opts=None): | |
357 | """return a timer function and formatter: (timer, formatter) |
|
357 | """return a timer function and formatter: (timer, formatter) | |
358 |
|
358 | |||
359 | This function exists to gather the creation of formatter in a single |
|
359 | This function exists to gather the creation of formatter in a single | |
360 | place instead of duplicating it in all performance commands.""" |
|
360 | place instead of duplicating it in all performance commands.""" | |
361 |
|
361 | |||
362 | # enforce an idle period before execution to counteract power management |
|
362 | # enforce an idle period before execution to counteract power management | |
363 | # experimental config: perf.presleep |
|
363 | # experimental config: perf.presleep | |
364 | time.sleep(getint(ui, b"perf", b"presleep", 1)) |
|
364 | time.sleep(getint(ui, b"perf", b"presleep", 1)) | |
365 |
|
365 | |||
366 | if opts is None: |
|
366 | if opts is None: | |
367 | opts = {} |
|
367 | opts = {} | |
368 | # redirect all to stderr unless buffer api is in use |
|
368 | # redirect all to stderr unless buffer api is in use | |
369 | if not ui._buffers: |
|
369 | if not ui._buffers: | |
370 | ui = ui.copy() |
|
370 | ui = ui.copy() | |
371 | uifout = safeattrsetter(ui, b'fout', ignoremissing=True) |
|
371 | uifout = safeattrsetter(ui, b'fout', ignoremissing=True) | |
372 | if uifout: |
|
372 | if uifout: | |
373 | # for "historical portability": |
|
373 | # for "historical portability": | |
374 | # ui.fout/ferr have been available since 1.9 (or 4e1ccd4c2b6d) |
|
374 | # ui.fout/ferr have been available since 1.9 (or 4e1ccd4c2b6d) | |
375 | uifout.set(ui.ferr) |
|
375 | uifout.set(ui.ferr) | |
376 |
|
376 | |||
377 | # get a formatter |
|
377 | # get a formatter | |
378 | uiformatter = getattr(ui, 'formatter', None) |
|
378 | uiformatter = getattr(ui, 'formatter', None) | |
379 | if uiformatter: |
|
379 | if uiformatter: | |
380 | fm = uiformatter(b'perf', opts) |
|
380 | fm = uiformatter(b'perf', opts) | |
381 | else: |
|
381 | else: | |
382 | # for "historical portability": |
|
382 | # for "historical portability": | |
383 | # define formatter locally, because ui.formatter has been |
|
383 | # define formatter locally, because ui.formatter has been | |
384 | # available since 2.2 (or ae5f92e154d3) |
|
384 | # available since 2.2 (or ae5f92e154d3) | |
385 | from mercurial import node |
|
385 | from mercurial import node | |
386 |
|
386 | |||
387 | class defaultformatter(object): |
|
387 | class defaultformatter(object): | |
388 | """Minimized composition of baseformatter and plainformatter |
|
388 | """Minimized composition of baseformatter and plainformatter | |
389 | """ |
|
389 | """ | |
390 |
|
390 | |||
391 | def __init__(self, ui, topic, opts): |
|
391 | def __init__(self, ui, topic, opts): | |
392 | self._ui = ui |
|
392 | self._ui = ui | |
393 | if ui.debugflag: |
|
393 | if ui.debugflag: | |
394 | self.hexfunc = node.hex |
|
394 | self.hexfunc = node.hex | |
395 | else: |
|
395 | else: | |
396 | self.hexfunc = node.short |
|
396 | self.hexfunc = node.short | |
397 |
|
397 | |||
398 | def __nonzero__(self): |
|
398 | def __nonzero__(self): | |
399 | return False |
|
399 | return False | |
400 |
|
400 | |||
401 | __bool__ = __nonzero__ |
|
401 | __bool__ = __nonzero__ | |
402 |
|
402 | |||
403 | def startitem(self): |
|
403 | def startitem(self): | |
404 | pass |
|
404 | pass | |
405 |
|
405 | |||
406 | def data(self, **data): |
|
406 | def data(self, **data): | |
407 | pass |
|
407 | pass | |
408 |
|
408 | |||
409 | def write(self, fields, deftext, *fielddata, **opts): |
|
409 | def write(self, fields, deftext, *fielddata, **opts): | |
410 | self._ui.write(deftext % fielddata, **opts) |
|
410 | self._ui.write(deftext % fielddata, **opts) | |
411 |
|
411 | |||
412 | def condwrite(self, cond, fields, deftext, *fielddata, **opts): |
|
412 | def condwrite(self, cond, fields, deftext, *fielddata, **opts): | |
413 | if cond: |
|
413 | if cond: | |
414 | self._ui.write(deftext % fielddata, **opts) |
|
414 | self._ui.write(deftext % fielddata, **opts) | |
415 |
|
415 | |||
416 | def plain(self, text, **opts): |
|
416 | def plain(self, text, **opts): | |
417 | self._ui.write(text, **opts) |
|
417 | self._ui.write(text, **opts) | |
418 |
|
418 | |||
419 | def end(self): |
|
419 | def end(self): | |
420 | pass |
|
420 | pass | |
421 |
|
421 | |||
422 | fm = defaultformatter(ui, b'perf', opts) |
|
422 | fm = defaultformatter(ui, b'perf', opts) | |
423 |
|
423 | |||
424 | # stub function, runs code only once instead of in a loop |
|
424 | # stub function, runs code only once instead of in a loop | |
425 | # experimental config: perf.stub |
|
425 | # experimental config: perf.stub | |
426 | if ui.configbool(b"perf", b"stub", False): |
|
426 | if ui.configbool(b"perf", b"stub", False): | |
427 | return functools.partial(stub_timer, fm), fm |
|
427 | return functools.partial(stub_timer, fm), fm | |
428 |
|
428 | |||
429 | # experimental config: perf.all-timing |
|
429 | # experimental config: perf.all-timing | |
430 | displayall = ui.configbool(b"perf", b"all-timing", False) |
|
430 | displayall = ui.configbool(b"perf", b"all-timing", False) | |
431 |
|
431 | |||
432 | # experimental config: perf.run-limits |
|
432 | # experimental config: perf.run-limits | |
433 | limitspec = ui.configlist(b"perf", b"run-limits", []) |
|
433 | limitspec = ui.configlist(b"perf", b"run-limits", []) | |
434 | limits = [] |
|
434 | limits = [] | |
435 | for item in limitspec: |
|
435 | for item in limitspec: | |
436 | parts = item.split(b'-', 1) |
|
436 | parts = item.split(b'-', 1) | |
437 | if len(parts) < 2: |
|
437 | if len(parts) < 2: | |
438 | ui.warn((b'malformatted run limit entry, missing "-": %s\n' % item)) |
|
438 | ui.warn((b'malformatted run limit entry, missing "-": %s\n' % item)) | |
439 | continue |
|
439 | continue | |
440 | try: |
|
440 | try: | |
441 | time_limit = float(_sysstr(parts[0])) |
|
441 | time_limit = float(_sysstr(parts[0])) | |
442 | except ValueError as e: |
|
442 | except ValueError as e: | |
443 | ui.warn( |
|
443 | ui.warn( | |
444 | ( |
|
444 | ( | |
445 | b'malformatted run limit entry, %s: %s\n' |
|
445 | b'malformatted run limit entry, %s: %s\n' | |
446 | % (_bytestr(e), item) |
|
446 | % (_bytestr(e), item) | |
447 | ) |
|
447 | ) | |
448 | ) |
|
448 | ) | |
449 | continue |
|
449 | continue | |
450 | try: |
|
450 | try: | |
451 | run_limit = int(_sysstr(parts[1])) |
|
451 | run_limit = int(_sysstr(parts[1])) | |
452 | except ValueError as e: |
|
452 | except ValueError as e: | |
453 | ui.warn( |
|
453 | ui.warn( | |
454 | ( |
|
454 | ( | |
455 | b'malformatted run limit entry, %s: %s\n' |
|
455 | b'malformatted run limit entry, %s: %s\n' | |
456 | % (_bytestr(e), item) |
|
456 | % (_bytestr(e), item) | |
457 | ) |
|
457 | ) | |
458 | ) |
|
458 | ) | |
459 | continue |
|
459 | continue | |
460 | limits.append((time_limit, run_limit)) |
|
460 | limits.append((time_limit, run_limit)) | |
461 | if not limits: |
|
461 | if not limits: | |
462 | limits = DEFAULTLIMITS |
|
462 | limits = DEFAULTLIMITS | |
463 |
|
463 | |||
464 | profiler = None |
|
464 | profiler = None | |
465 | if profiling is not None: |
|
465 | if profiling is not None: | |
466 | if ui.configbool(b"perf", b"profile-benchmark", False): |
|
466 | if ui.configbool(b"perf", b"profile-benchmark", False): | |
467 | profiler = profiling.profile(ui) |
|
467 | profiler = profiling.profile(ui) | |
468 |
|
468 | |||
469 | prerun = getint(ui, b"perf", b"pre-run", 0) |
|
469 | prerun = getint(ui, b"perf", b"pre-run", 0) | |
470 | t = functools.partial( |
|
470 | t = functools.partial( | |
471 | _timer, |
|
471 | _timer, | |
472 | fm, |
|
472 | fm, | |
473 | displayall=displayall, |
|
473 | displayall=displayall, | |
474 | limits=limits, |
|
474 | limits=limits, | |
475 | prerun=prerun, |
|
475 | prerun=prerun, | |
476 | profiler=profiler, |
|
476 | profiler=profiler, | |
477 | ) |
|
477 | ) | |
478 | return t, fm |
|
478 | return t, fm | |
479 |
|
479 | |||
480 |
|
480 | |||
481 | def stub_timer(fm, func, setup=None, title=None): |
|
481 | def stub_timer(fm, func, setup=None, title=None): | |
482 | if setup is not None: |
|
482 | if setup is not None: | |
483 | setup() |
|
483 | setup() | |
484 | func() |
|
484 | func() | |
485 |
|
485 | |||
486 |
|
486 | |||
487 | @contextlib.contextmanager |
|
487 | @contextlib.contextmanager | |
488 | def timeone(): |
|
488 | def timeone(): | |
489 | r = [] |
|
489 | r = [] | |
490 | ostart = os.times() |
|
490 | ostart = os.times() | |
491 | cstart = util.timer() |
|
491 | cstart = util.timer() | |
492 | yield r |
|
492 | yield r | |
493 | cstop = util.timer() |
|
493 | cstop = util.timer() | |
494 | ostop = os.times() |
|
494 | ostop = os.times() | |
495 | a, b = ostart, ostop |
|
495 | a, b = ostart, ostop | |
496 | r.append((cstop - cstart, b[0] - a[0], b[1] - a[1])) |
|
496 | r.append((cstop - cstart, b[0] - a[0], b[1] - a[1])) | |
497 |
|
497 | |||
498 |
|
498 | |||
499 | # list of stop condition (elapsed time, minimal run count) |
|
499 | # list of stop condition (elapsed time, minimal run count) | |
500 | DEFAULTLIMITS = ( |
|
500 | DEFAULTLIMITS = ( | |
501 | (3.0, 100), |
|
501 | (3.0, 100), | |
502 | (10.0, 3), |
|
502 | (10.0, 3), | |
503 | ) |
|
503 | ) | |
504 |
|
504 | |||
505 |
|
505 | |||
506 | def _timer( |
|
506 | def _timer( | |
507 | fm, |
|
507 | fm, | |
508 | func, |
|
508 | func, | |
509 | setup=None, |
|
509 | setup=None, | |
510 | title=None, |
|
510 | title=None, | |
511 | displayall=False, |
|
511 | displayall=False, | |
512 | limits=DEFAULTLIMITS, |
|
512 | limits=DEFAULTLIMITS, | |
513 | prerun=0, |
|
513 | prerun=0, | |
514 | profiler=None, |
|
514 | profiler=None, | |
515 | ): |
|
515 | ): | |
516 | gc.collect() |
|
516 | gc.collect() | |
517 | results = [] |
|
517 | results = [] | |
518 | begin = util.timer() |
|
518 | begin = util.timer() | |
519 | count = 0 |
|
519 | count = 0 | |
520 | if profiler is None: |
|
520 | if profiler is None: | |
521 | profiler = NOOPCTX |
|
521 | profiler = NOOPCTX | |
522 | for i in range(prerun): |
|
522 | for i in range(prerun): | |
523 | if setup is not None: |
|
523 | if setup is not None: | |
524 | setup() |
|
524 | setup() | |
525 | func() |
|
525 | func() | |
526 | keepgoing = True |
|
526 | keepgoing = True | |
527 | while keepgoing: |
|
527 | while keepgoing: | |
528 | if setup is not None: |
|
528 | if setup is not None: | |
529 | setup() |
|
529 | setup() | |
530 | with profiler: |
|
530 | with profiler: | |
531 | with timeone() as item: |
|
531 | with timeone() as item: | |
532 | r = func() |
|
532 | r = func() | |
533 | profiler = NOOPCTX |
|
533 | profiler = NOOPCTX | |
534 | count += 1 |
|
534 | count += 1 | |
535 | results.append(item[0]) |
|
535 | results.append(item[0]) | |
536 | cstop = util.timer() |
|
536 | cstop = util.timer() | |
537 | # Look for a stop condition. |
|
537 | # Look for a stop condition. | |
538 | elapsed = cstop - begin |
|
538 | elapsed = cstop - begin | |
539 | for t, mincount in limits: |
|
539 | for t, mincount in limits: | |
540 | if elapsed >= t and count >= mincount: |
|
540 | if elapsed >= t and count >= mincount: | |
541 | keepgoing = False |
|
541 | keepgoing = False | |
542 | break |
|
542 | break | |
543 |
|
543 | |||
544 | formatone(fm, results, title=title, result=r, displayall=displayall) |
|
544 | formatone(fm, results, title=title, result=r, displayall=displayall) | |
545 |
|
545 | |||
546 |
|
546 | |||
547 | def formatone(fm, timings, title=None, result=None, displayall=False): |
|
547 | def formatone(fm, timings, title=None, result=None, displayall=False): | |
548 |
|
548 | |||
549 | count = len(timings) |
|
549 | count = len(timings) | |
550 |
|
550 | |||
551 | fm.startitem() |
|
551 | fm.startitem() | |
552 |
|
552 | |||
553 | if title: |
|
553 | if title: | |
554 | fm.write(b'title', b'! %s\n', title) |
|
554 | fm.write(b'title', b'! %s\n', title) | |
555 | if result: |
|
555 | if result: | |
556 | fm.write(b'result', b'! result: %s\n', result) |
|
556 | fm.write(b'result', b'! result: %s\n', result) | |
557 |
|
557 | |||
558 | def display(role, entry): |
|
558 | def display(role, entry): | |
559 | prefix = b'' |
|
559 | prefix = b'' | |
560 | if role != b'best': |
|
560 | if role != b'best': | |
561 | prefix = b'%s.' % role |
|
561 | prefix = b'%s.' % role | |
562 | fm.plain(b'!') |
|
562 | fm.plain(b'!') | |
563 | fm.write(prefix + b'wall', b' wall %f', entry[0]) |
|
563 | fm.write(prefix + b'wall', b' wall %f', entry[0]) | |
564 | fm.write(prefix + b'comb', b' comb %f', entry[1] + entry[2]) |
|
564 | fm.write(prefix + b'comb', b' comb %f', entry[1] + entry[2]) | |
565 | fm.write(prefix + b'user', b' user %f', entry[1]) |
|
565 | fm.write(prefix + b'user', b' user %f', entry[1]) | |
566 | fm.write(prefix + b'sys', b' sys %f', entry[2]) |
|
566 | fm.write(prefix + b'sys', b' sys %f', entry[2]) | |
567 | fm.write(prefix + b'count', b' (%s of %%d)' % role, count) |
|
567 | fm.write(prefix + b'count', b' (%s of %%d)' % role, count) | |
568 | fm.plain(b'\n') |
|
568 | fm.plain(b'\n') | |
569 |
|
569 | |||
570 | timings.sort() |
|
570 | timings.sort() | |
571 | min_val = timings[0] |
|
571 | min_val = timings[0] | |
572 | display(b'best', min_val) |
|
572 | display(b'best', min_val) | |
573 | if displayall: |
|
573 | if displayall: | |
574 | max_val = timings[-1] |
|
574 | max_val = timings[-1] | |
575 | display(b'max', max_val) |
|
575 | display(b'max', max_val) | |
576 | avg = tuple([sum(x) / count for x in zip(*timings)]) |
|
576 | avg = tuple([sum(x) / count for x in zip(*timings)]) | |
577 | display(b'avg', avg) |
|
577 | display(b'avg', avg) | |
578 | median = timings[len(timings) // 2] |
|
578 | median = timings[len(timings) // 2] | |
579 | display(b'median', median) |
|
579 | display(b'median', median) | |
580 |
|
580 | |||
581 |
|
581 | |||
582 | # utilities for historical portability |
|
582 | # utilities for historical portability | |
583 |
|
583 | |||
584 |
|
584 | |||
585 | def getint(ui, section, name, default): |
|
585 | def getint(ui, section, name, default): | |
586 | # for "historical portability": |
|
586 | # for "historical portability": | |
587 | # ui.configint has been available since 1.9 (or fa2b596db182) |
|
587 | # ui.configint has been available since 1.9 (or fa2b596db182) | |
588 | v = ui.config(section, name, None) |
|
588 | v = ui.config(section, name, None) | |
589 | if v is None: |
|
589 | if v is None: | |
590 | return default |
|
590 | return default | |
591 | try: |
|
591 | try: | |
592 | return int(v) |
|
592 | return int(v) | |
593 | except ValueError: |
|
593 | except ValueError: | |
594 | raise error.ConfigError( |
|
594 | raise error.ConfigError( | |
595 | b"%s.%s is not an integer ('%s')" % (section, name, v) |
|
595 | b"%s.%s is not an integer ('%s')" % (section, name, v) | |
596 | ) |
|
596 | ) | |
597 |
|
597 | |||
598 |
|
598 | |||
599 | def safeattrsetter(obj, name, ignoremissing=False): |
|
599 | def safeattrsetter(obj, name, ignoremissing=False): | |
600 | """Ensure that 'obj' has 'name' attribute before subsequent setattr |
|
600 | """Ensure that 'obj' has 'name' attribute before subsequent setattr | |
601 |
|
601 | |||
602 | This function is aborted, if 'obj' doesn't have 'name' attribute |
|
602 | This function is aborted, if 'obj' doesn't have 'name' attribute | |
603 | at runtime. This avoids overlooking removal of an attribute, which |
|
603 | at runtime. This avoids overlooking removal of an attribute, which | |
604 | breaks assumption of performance measurement, in the future. |
|
604 | breaks assumption of performance measurement, in the future. | |
605 |
|
605 | |||
606 | This function returns the object to (1) assign a new value, and |
|
606 | This function returns the object to (1) assign a new value, and | |
607 | (2) restore an original value to the attribute. |
|
607 | (2) restore an original value to the attribute. | |
608 |
|
608 | |||
609 | If 'ignoremissing' is true, missing 'name' attribute doesn't cause |
|
609 | If 'ignoremissing' is true, missing 'name' attribute doesn't cause | |
610 | abortion, and this function returns None. This is useful to |
|
610 | abortion, and this function returns None. This is useful to | |
611 | examine an attribute, which isn't ensured in all Mercurial |
|
611 | examine an attribute, which isn't ensured in all Mercurial | |
612 | versions. |
|
612 | versions. | |
613 | """ |
|
613 | """ | |
614 | if not util.safehasattr(obj, name): |
|
614 | if not util.safehasattr(obj, name): | |
615 | if ignoremissing: |
|
615 | if ignoremissing: | |
616 | return None |
|
616 | return None | |
617 | raise error.Abort( |
|
617 | raise error.Abort( | |
618 | ( |
|
618 | ( | |
619 | b"missing attribute %s of %s might break assumption" |
|
619 | b"missing attribute %s of %s might break assumption" | |
620 | b" of performance measurement" |
|
620 | b" of performance measurement" | |
621 | ) |
|
621 | ) | |
622 | % (name, obj) |
|
622 | % (name, obj) | |
623 | ) |
|
623 | ) | |
624 |
|
624 | |||
625 | origvalue = getattr(obj, _sysstr(name)) |
|
625 | origvalue = getattr(obj, _sysstr(name)) | |
626 |
|
626 | |||
627 | class attrutil(object): |
|
627 | class attrutil(object): | |
628 | def set(self, newvalue): |
|
628 | def set(self, newvalue): | |
629 | setattr(obj, _sysstr(name), newvalue) |
|
629 | setattr(obj, _sysstr(name), newvalue) | |
630 |
|
630 | |||
631 | def restore(self): |
|
631 | def restore(self): | |
632 | setattr(obj, _sysstr(name), origvalue) |
|
632 | setattr(obj, _sysstr(name), origvalue) | |
633 |
|
633 | |||
634 | return attrutil() |
|
634 | return attrutil() | |
635 |
|
635 | |||
636 |
|
636 | |||
637 | # utilities to examine each internal API changes |
|
637 | # utilities to examine each internal API changes | |
638 |
|
638 | |||
639 |
|
639 | |||
640 | def getbranchmapsubsettable(): |
|
640 | def getbranchmapsubsettable(): | |
641 | # for "historical portability": |
|
641 | # for "historical portability": | |
642 | # subsettable is defined in: |
|
642 | # subsettable is defined in: | |
643 | # - branchmap since 2.9 (or 175c6fd8cacc) |
|
643 | # - branchmap since 2.9 (or 175c6fd8cacc) | |
644 | # - repoview since 2.5 (or 59a9f18d4587) |
|
644 | # - repoview since 2.5 (or 59a9f18d4587) | |
645 | # - repoviewutil since 5.0 |
|
645 | # - repoviewutil since 5.0 | |
646 | for mod in (branchmap, repoview, repoviewutil): |
|
646 | for mod in (branchmap, repoview, repoviewutil): | |
647 | subsettable = getattr(mod, 'subsettable', None) |
|
647 | subsettable = getattr(mod, 'subsettable', None) | |
648 | if subsettable: |
|
648 | if subsettable: | |
649 | return subsettable |
|
649 | return subsettable | |
650 |
|
650 | |||
651 | # bisecting in bcee63733aad::59a9f18d4587 can reach here (both |
|
651 | # bisecting in bcee63733aad::59a9f18d4587 can reach here (both | |
652 | # branchmap and repoview modules exist, but subsettable attribute |
|
652 | # branchmap and repoview modules exist, but subsettable attribute | |
653 | # doesn't) |
|
653 | # doesn't) | |
654 | raise error.Abort( |
|
654 | raise error.Abort( | |
655 | b"perfbranchmap not available with this Mercurial", |
|
655 | b"perfbranchmap not available with this Mercurial", | |
656 | hint=b"use 2.5 or later", |
|
656 | hint=b"use 2.5 or later", | |
657 | ) |
|
657 | ) | |
658 |
|
658 | |||
659 |
|
659 | |||
660 | def getsvfs(repo): |
|
660 | def getsvfs(repo): | |
661 | """Return appropriate object to access files under .hg/store |
|
661 | """Return appropriate object to access files under .hg/store | |
662 | """ |
|
662 | """ | |
663 | # for "historical portability": |
|
663 | # for "historical portability": | |
664 | # repo.svfs has been available since 2.3 (or 7034365089bf) |
|
664 | # repo.svfs has been available since 2.3 (or 7034365089bf) | |
665 | svfs = getattr(repo, 'svfs', None) |
|
665 | svfs = getattr(repo, 'svfs', None) | |
666 | if svfs: |
|
666 | if svfs: | |
667 | return svfs |
|
667 | return svfs | |
668 | else: |
|
668 | else: | |
669 | return getattr(repo, 'sopener') |
|
669 | return getattr(repo, 'sopener') | |
670 |
|
670 | |||
671 |
|
671 | |||
672 | def getvfs(repo): |
|
672 | def getvfs(repo): | |
673 | """Return appropriate object to access files under .hg |
|
673 | """Return appropriate object to access files under .hg | |
674 | """ |
|
674 | """ | |
675 | # for "historical portability": |
|
675 | # for "historical portability": | |
676 | # repo.vfs has been available since 2.3 (or 7034365089bf) |
|
676 | # repo.vfs has been available since 2.3 (or 7034365089bf) | |
677 | vfs = getattr(repo, 'vfs', None) |
|
677 | vfs = getattr(repo, 'vfs', None) | |
678 | if vfs: |
|
678 | if vfs: | |
679 | return vfs |
|
679 | return vfs | |
680 | else: |
|
680 | else: | |
681 | return getattr(repo, 'opener') |
|
681 | return getattr(repo, 'opener') | |
682 |
|
682 | |||
683 |
|
683 | |||
684 | def repocleartagscachefunc(repo): |
|
684 | def repocleartagscachefunc(repo): | |
685 | """Return the function to clear tags cache according to repo internal API |
|
685 | """Return the function to clear tags cache according to repo internal API | |
686 | """ |
|
686 | """ | |
687 | if util.safehasattr(repo, b'_tagscache'): # since 2.0 (or 9dca7653b525) |
|
687 | if util.safehasattr(repo, b'_tagscache'): # since 2.0 (or 9dca7653b525) | |
688 | # in this case, setattr(repo, '_tagscache', None) or so isn't |
|
688 | # in this case, setattr(repo, '_tagscache', None) or so isn't | |
689 | # correct way to clear tags cache, because existing code paths |
|
689 | # correct way to clear tags cache, because existing code paths | |
690 | # expect _tagscache to be a structured object. |
|
690 | # expect _tagscache to be a structured object. | |
691 | def clearcache(): |
|
691 | def clearcache(): | |
692 | # _tagscache has been filteredpropertycache since 2.5 (or |
|
692 | # _tagscache has been filteredpropertycache since 2.5 (or | |
693 | # 98c867ac1330), and delattr() can't work in such case |
|
693 | # 98c867ac1330), and delattr() can't work in such case | |
694 | if b'_tagscache' in vars(repo): |
|
694 | if b'_tagscache' in vars(repo): | |
695 | del repo.__dict__[b'_tagscache'] |
|
695 | del repo.__dict__[b'_tagscache'] | |
696 |
|
696 | |||
697 | return clearcache |
|
697 | return clearcache | |
698 |
|
698 | |||
699 | repotags = safeattrsetter(repo, b'_tags', ignoremissing=True) |
|
699 | repotags = safeattrsetter(repo, b'_tags', ignoremissing=True) | |
700 | if repotags: # since 1.4 (or 5614a628d173) |
|
700 | if repotags: # since 1.4 (or 5614a628d173) | |
701 | return lambda: repotags.set(None) |
|
701 | return lambda: repotags.set(None) | |
702 |
|
702 | |||
703 | repotagscache = safeattrsetter(repo, b'tagscache', ignoremissing=True) |
|
703 | repotagscache = safeattrsetter(repo, b'tagscache', ignoremissing=True) | |
704 | if repotagscache: # since 0.6 (or d7df759d0e97) |
|
704 | if repotagscache: # since 0.6 (or d7df759d0e97) | |
705 | return lambda: repotagscache.set(None) |
|
705 | return lambda: repotagscache.set(None) | |
706 |
|
706 | |||
707 | # Mercurial earlier than 0.6 (or d7df759d0e97) logically reaches |
|
707 | # Mercurial earlier than 0.6 (or d7df759d0e97) logically reaches | |
708 | # this point, but it isn't so problematic, because: |
|
708 | # this point, but it isn't so problematic, because: | |
709 | # - repo.tags of such Mercurial isn't "callable", and repo.tags() |
|
709 | # - repo.tags of such Mercurial isn't "callable", and repo.tags() | |
710 | # in perftags() causes failure soon |
|
710 | # in perftags() causes failure soon | |
711 | # - perf.py itself has been available since 1.1 (or eb240755386d) |
|
711 | # - perf.py itself has been available since 1.1 (or eb240755386d) | |
712 | raise error.Abort(b"tags API of this hg command is unknown") |
|
712 | raise error.Abort(b"tags API of this hg command is unknown") | |
713 |
|
713 | |||
714 |
|
714 | |||
715 | # utilities to clear cache |
|
715 | # utilities to clear cache | |
716 |
|
716 | |||
717 |
|
717 | |||
718 | def clearfilecache(obj, attrname): |
|
718 | def clearfilecache(obj, attrname): | |
719 | unfiltered = getattr(obj, 'unfiltered', None) |
|
719 | unfiltered = getattr(obj, 'unfiltered', None) | |
720 | if unfiltered is not None: |
|
720 | if unfiltered is not None: | |
721 | obj = obj.unfiltered() |
|
721 | obj = obj.unfiltered() | |
722 | if attrname in vars(obj): |
|
722 | if attrname in vars(obj): | |
723 | delattr(obj, attrname) |
|
723 | delattr(obj, attrname) | |
724 | obj._filecache.pop(attrname, None) |
|
724 | obj._filecache.pop(attrname, None) | |
725 |
|
725 | |||
726 |
|
726 | |||
727 | def clearchangelog(repo): |
|
727 | def clearchangelog(repo): | |
728 | if repo is not repo.unfiltered(): |
|
728 | if repo is not repo.unfiltered(): | |
729 | object.__setattr__(repo, r'_clcachekey', None) |
|
729 | object.__setattr__(repo, r'_clcachekey', None) | |
730 | object.__setattr__(repo, r'_clcache', None) |
|
730 | object.__setattr__(repo, r'_clcache', None) | |
731 | clearfilecache(repo.unfiltered(), 'changelog') |
|
731 | clearfilecache(repo.unfiltered(), 'changelog') | |
732 |
|
732 | |||
733 |
|
733 | |||
734 | # perf commands |
|
734 | # perf commands | |
735 |
|
735 | |||
736 |
|
736 | |||
737 | @command(b'perfwalk', formatteropts) |
|
737 | @command(b'perfwalk', formatteropts) | |
738 | def perfwalk(ui, repo, *pats, **opts): |
|
738 | def perfwalk(ui, repo, *pats, **opts): | |
739 | opts = _byteskwargs(opts) |
|
739 | opts = _byteskwargs(opts) | |
740 | timer, fm = gettimer(ui, opts) |
|
740 | timer, fm = gettimer(ui, opts) | |
741 | m = scmutil.match(repo[None], pats, {}) |
|
741 | m = scmutil.match(repo[None], pats, {}) | |
742 | timer( |
|
742 | timer( | |
743 | lambda: len( |
|
743 | lambda: len( | |
744 | list( |
|
744 | list( | |
745 | repo.dirstate.walk(m, subrepos=[], unknown=True, ignored=False) |
|
745 | repo.dirstate.walk(m, subrepos=[], unknown=True, ignored=False) | |
746 | ) |
|
746 | ) | |
747 | ) |
|
747 | ) | |
748 | ) |
|
748 | ) | |
749 | fm.end() |
|
749 | fm.end() | |
750 |
|
750 | |||
751 |
|
751 | |||
752 | @command(b'perfannotate', formatteropts) |
|
752 | @command(b'perfannotate', formatteropts) | |
753 | def perfannotate(ui, repo, f, **opts): |
|
753 | def perfannotate(ui, repo, f, **opts): | |
754 | opts = _byteskwargs(opts) |
|
754 | opts = _byteskwargs(opts) | |
755 | timer, fm = gettimer(ui, opts) |
|
755 | timer, fm = gettimer(ui, opts) | |
756 | fc = repo[b'.'][f] |
|
756 | fc = repo[b'.'][f] | |
757 | timer(lambda: len(fc.annotate(True))) |
|
757 | timer(lambda: len(fc.annotate(True))) | |
758 | fm.end() |
|
758 | fm.end() | |
759 |
|
759 | |||
760 |
|
760 | |||
761 | @command( |
|
761 | @command( | |
762 | b'perfstatus', |
|
762 | b'perfstatus', | |
763 | [(b'u', b'unknown', False, b'ask status to look for unknown files')] |
|
763 | [(b'u', b'unknown', False, b'ask status to look for unknown files')] | |
764 | + formatteropts, |
|
764 | + formatteropts, | |
765 | ) |
|
765 | ) | |
766 | def perfstatus(ui, repo, **opts): |
|
766 | def perfstatus(ui, repo, **opts): | |
767 | """benchmark the performance of a single status call |
|
767 | """benchmark the performance of a single status call | |
768 |
|
768 | |||
769 | The repository data are preserved between each call. |
|
769 | The repository data are preserved between each call. | |
770 |
|
770 | |||
771 | By default, only the status of the tracked file are requested. If |
|
771 | By default, only the status of the tracked file are requested. If | |
772 | `--unknown` is passed, the "unknown" files are also tracked. |
|
772 | `--unknown` is passed, the "unknown" files are also tracked. | |
773 | """ |
|
773 | """ | |
774 | opts = _byteskwargs(opts) |
|
774 | opts = _byteskwargs(opts) | |
775 | # m = match.always(repo.root, repo.getcwd()) |
|
775 | # m = match.always(repo.root, repo.getcwd()) | |
776 | # timer(lambda: sum(map(len, repo.dirstate.status(m, [], False, False, |
|
776 | # timer(lambda: sum(map(len, repo.dirstate.status(m, [], False, False, | |
777 | # False)))) |
|
777 | # False)))) | |
778 | timer, fm = gettimer(ui, opts) |
|
778 | timer, fm = gettimer(ui, opts) | |
779 | timer(lambda: sum(map(len, repo.status(unknown=opts[b'unknown'])))) |
|
779 | timer(lambda: sum(map(len, repo.status(unknown=opts[b'unknown'])))) | |
780 | fm.end() |
|
780 | fm.end() | |
781 |
|
781 | |||
782 |
|
782 | |||
783 | @command(b'perfaddremove', formatteropts) |
|
783 | @command(b'perfaddremove', formatteropts) | |
784 | def perfaddremove(ui, repo, **opts): |
|
784 | def perfaddremove(ui, repo, **opts): | |
785 | opts = _byteskwargs(opts) |
|
785 | opts = _byteskwargs(opts) | |
786 | timer, fm = gettimer(ui, opts) |
|
786 | timer, fm = gettimer(ui, opts) | |
787 | try: |
|
787 | try: | |
788 | oldquiet = repo.ui.quiet |
|
788 | oldquiet = repo.ui.quiet | |
789 | repo.ui.quiet = True |
|
789 | repo.ui.quiet = True | |
790 | matcher = scmutil.match(repo[None]) |
|
790 | matcher = scmutil.match(repo[None]) | |
791 | opts[b'dry_run'] = True |
|
791 | opts[b'dry_run'] = True | |
792 | if b'uipathfn' in getargspec(scmutil.addremove).args: |
|
792 | if b'uipathfn' in getargspec(scmutil.addremove).args: | |
793 | uipathfn = scmutil.getuipathfn(repo) |
|
793 | uipathfn = scmutil.getuipathfn(repo) | |
794 | timer(lambda: scmutil.addremove(repo, matcher, b"", uipathfn, opts)) |
|
794 | timer(lambda: scmutil.addremove(repo, matcher, b"", uipathfn, opts)) | |
795 | else: |
|
795 | else: | |
796 | timer(lambda: scmutil.addremove(repo, matcher, b"", opts)) |
|
796 | timer(lambda: scmutil.addremove(repo, matcher, b"", opts)) | |
797 | finally: |
|
797 | finally: | |
798 | repo.ui.quiet = oldquiet |
|
798 | repo.ui.quiet = oldquiet | |
799 | fm.end() |
|
799 | fm.end() | |
800 |
|
800 | |||
801 |
|
801 | |||
802 | def clearcaches(cl): |
|
802 | def clearcaches(cl): | |
803 | # behave somewhat consistently across internal API changes |
|
803 | # behave somewhat consistently across internal API changes | |
804 | if util.safehasattr(cl, b'clearcaches'): |
|
804 | if util.safehasattr(cl, b'clearcaches'): | |
805 | cl.clearcaches() |
|
805 | cl.clearcaches() | |
806 | elif util.safehasattr(cl, b'_nodecache'): |
|
806 | elif util.safehasattr(cl, b'_nodecache'): | |
807 | from mercurial.node import nullid, nullrev |
|
807 | from mercurial.node import nullid, nullrev | |
808 |
|
808 | |||
809 | cl._nodecache = {nullid: nullrev} |
|
809 | cl._nodecache = {nullid: nullrev} | |
810 | cl._nodepos = None |
|
810 | cl._nodepos = None | |
811 |
|
811 | |||
812 |
|
812 | |||
813 | @command(b'perfheads', formatteropts) |
|
813 | @command(b'perfheads', formatteropts) | |
814 | def perfheads(ui, repo, **opts): |
|
814 | def perfheads(ui, repo, **opts): | |
815 | """benchmark the computation of a changelog heads""" |
|
815 | """benchmark the computation of a changelog heads""" | |
816 | opts = _byteskwargs(opts) |
|
816 | opts = _byteskwargs(opts) | |
817 | timer, fm = gettimer(ui, opts) |
|
817 | timer, fm = gettimer(ui, opts) | |
818 | cl = repo.changelog |
|
818 | cl = repo.changelog | |
819 |
|
819 | |||
820 | def s(): |
|
820 | def s(): | |
821 | clearcaches(cl) |
|
821 | clearcaches(cl) | |
822 |
|
822 | |||
823 | def d(): |
|
823 | def d(): | |
824 | len(cl.headrevs()) |
|
824 | len(cl.headrevs()) | |
825 |
|
825 | |||
826 | timer(d, setup=s) |
|
826 | timer(d, setup=s) | |
827 | fm.end() |
|
827 | fm.end() | |
828 |
|
828 | |||
829 |
|
829 | |||
830 | @command( |
|
830 | @command( | |
831 | b'perftags', |
|
831 | b'perftags', | |
832 | formatteropts |
|
832 | formatteropts | |
833 | + [(b'', b'clear-revlogs', False, b'refresh changelog and manifest'),], |
|
833 | + [(b'', b'clear-revlogs', False, b'refresh changelog and manifest'),], | |
834 | ) |
|
834 | ) | |
835 | def perftags(ui, repo, **opts): |
|
835 | def perftags(ui, repo, **opts): | |
836 | opts = _byteskwargs(opts) |
|
836 | opts = _byteskwargs(opts) | |
837 | timer, fm = gettimer(ui, opts) |
|
837 | timer, fm = gettimer(ui, opts) | |
838 | repocleartagscache = repocleartagscachefunc(repo) |
|
838 | repocleartagscache = repocleartagscachefunc(repo) | |
839 | clearrevlogs = opts[b'clear_revlogs'] |
|
839 | clearrevlogs = opts[b'clear_revlogs'] | |
840 |
|
840 | |||
841 | def s(): |
|
841 | def s(): | |
842 | if clearrevlogs: |
|
842 | if clearrevlogs: | |
843 | clearchangelog(repo) |
|
843 | clearchangelog(repo) | |
844 | clearfilecache(repo.unfiltered(), 'manifest') |
|
844 | clearfilecache(repo.unfiltered(), 'manifest') | |
845 | repocleartagscache() |
|
845 | repocleartagscache() | |
846 |
|
846 | |||
847 | def t(): |
|
847 | def t(): | |
848 | return len(repo.tags()) |
|
848 | return len(repo.tags()) | |
849 |
|
849 | |||
850 | timer(t, setup=s) |
|
850 | timer(t, setup=s) | |
851 | fm.end() |
|
851 | fm.end() | |
852 |
|
852 | |||
853 |
|
853 | |||
854 | @command(b'perfancestors', formatteropts) |
|
854 | @command(b'perfancestors', formatteropts) | |
855 | def perfancestors(ui, repo, **opts): |
|
855 | def perfancestors(ui, repo, **opts): | |
856 | opts = _byteskwargs(opts) |
|
856 | opts = _byteskwargs(opts) | |
857 | timer, fm = gettimer(ui, opts) |
|
857 | timer, fm = gettimer(ui, opts) | |
858 | heads = repo.changelog.headrevs() |
|
858 | heads = repo.changelog.headrevs() | |
859 |
|
859 | |||
860 | def d(): |
|
860 | def d(): | |
861 | for a in repo.changelog.ancestors(heads): |
|
861 | for a in repo.changelog.ancestors(heads): | |
862 | pass |
|
862 | pass | |
863 |
|
863 | |||
864 | timer(d) |
|
864 | timer(d) | |
865 | fm.end() |
|
865 | fm.end() | |
866 |
|
866 | |||
867 |
|
867 | |||
868 | @command(b'perfancestorset', formatteropts) |
|
868 | @command(b'perfancestorset', formatteropts) | |
869 | def perfancestorset(ui, repo, revset, **opts): |
|
869 | def perfancestorset(ui, repo, revset, **opts): | |
870 | opts = _byteskwargs(opts) |
|
870 | opts = _byteskwargs(opts) | |
871 | timer, fm = gettimer(ui, opts) |
|
871 | timer, fm = gettimer(ui, opts) | |
872 | revs = repo.revs(revset) |
|
872 | revs = repo.revs(revset) | |
873 | heads = repo.changelog.headrevs() |
|
873 | heads = repo.changelog.headrevs() | |
874 |
|
874 | |||
875 | def d(): |
|
875 | def d(): | |
876 | s = repo.changelog.ancestors(heads) |
|
876 | s = repo.changelog.ancestors(heads) | |
877 | for rev in revs: |
|
877 | for rev in revs: | |
878 | rev in s |
|
878 | rev in s | |
879 |
|
879 | |||
880 | timer(d) |
|
880 | timer(d) | |
881 | fm.end() |
|
881 | fm.end() | |
882 |
|
882 | |||
883 |
|
883 | |||
884 | @command(b'perfdiscovery', formatteropts, b'PATH') |
|
884 | @command(b'perfdiscovery', formatteropts, b'PATH') | |
885 | def perfdiscovery(ui, repo, path, **opts): |
|
885 | def perfdiscovery(ui, repo, path, **opts): | |
886 | """benchmark discovery between local repo and the peer at given path |
|
886 | """benchmark discovery between local repo and the peer at given path | |
887 | """ |
|
887 | """ | |
888 | repos = [repo, None] |
|
888 | repos = [repo, None] | |
889 | timer, fm = gettimer(ui, opts) |
|
889 | timer, fm = gettimer(ui, opts) | |
890 | path = ui.expandpath(path) |
|
890 | path = ui.expandpath(path) | |
891 |
|
891 | |||
892 | def s(): |
|
892 | def s(): | |
893 | repos[1] = hg.peer(ui, opts, path) |
|
893 | repos[1] = hg.peer(ui, opts, path) | |
894 |
|
894 | |||
895 | def d(): |
|
895 | def d(): | |
896 | setdiscovery.findcommonheads(ui, *repos) |
|
896 | setdiscovery.findcommonheads(ui, *repos) | |
897 |
|
897 | |||
898 | timer(d, setup=s) |
|
898 | timer(d, setup=s) | |
899 | fm.end() |
|
899 | fm.end() | |
900 |
|
900 | |||
901 |
|
901 | |||
902 | @command( |
|
902 | @command( | |
903 | b'perfbookmarks', |
|
903 | b'perfbookmarks', | |
904 | formatteropts |
|
904 | formatteropts | |
905 | + [(b'', b'clear-revlogs', False, b'refresh changelog and manifest'),], |
|
905 | + [(b'', b'clear-revlogs', False, b'refresh changelog and manifest'),], | |
906 | ) |
|
906 | ) | |
907 | def perfbookmarks(ui, repo, **opts): |
|
907 | def perfbookmarks(ui, repo, **opts): | |
908 | """benchmark parsing bookmarks from disk to memory""" |
|
908 | """benchmark parsing bookmarks from disk to memory""" | |
909 | opts = _byteskwargs(opts) |
|
909 | opts = _byteskwargs(opts) | |
910 | timer, fm = gettimer(ui, opts) |
|
910 | timer, fm = gettimer(ui, opts) | |
911 |
|
911 | |||
912 | clearrevlogs = opts[b'clear_revlogs'] |
|
912 | clearrevlogs = opts[b'clear_revlogs'] | |
913 |
|
913 | |||
914 | def s(): |
|
914 | def s(): | |
915 | if clearrevlogs: |
|
915 | if clearrevlogs: | |
916 | clearchangelog(repo) |
|
916 | clearchangelog(repo) | |
917 | clearfilecache(repo, b'_bookmarks') |
|
917 | clearfilecache(repo, b'_bookmarks') | |
918 |
|
918 | |||
919 | def d(): |
|
919 | def d(): | |
920 | repo._bookmarks |
|
920 | repo._bookmarks | |
921 |
|
921 | |||
922 | timer(d, setup=s) |
|
922 | timer(d, setup=s) | |
923 | fm.end() |
|
923 | fm.end() | |
924 |
|
924 | |||
925 |
|
925 | |||
926 | @command(b'perfbundleread', formatteropts, b'BUNDLE') |
|
926 | @command(b'perfbundleread', formatteropts, b'BUNDLE') | |
927 | def perfbundleread(ui, repo, bundlepath, **opts): |
|
927 | def perfbundleread(ui, repo, bundlepath, **opts): | |
928 | """Benchmark reading of bundle files. |
|
928 | """Benchmark reading of bundle files. | |
929 |
|
929 | |||
930 | This command is meant to isolate the I/O part of bundle reading as |
|
930 | This command is meant to isolate the I/O part of bundle reading as | |
931 | much as possible. |
|
931 | much as possible. | |
932 | """ |
|
932 | """ | |
933 | from mercurial import ( |
|
933 | from mercurial import ( | |
934 | bundle2, |
|
934 | bundle2, | |
935 | exchange, |
|
935 | exchange, | |
936 | streamclone, |
|
936 | streamclone, | |
937 | ) |
|
937 | ) | |
938 |
|
938 | |||
939 | opts = _byteskwargs(opts) |
|
939 | opts = _byteskwargs(opts) | |
940 |
|
940 | |||
941 | def makebench(fn): |
|
941 | def makebench(fn): | |
942 | def run(): |
|
942 | def run(): | |
943 | with open(bundlepath, b'rb') as fh: |
|
943 | with open(bundlepath, b'rb') as fh: | |
944 | bundle = exchange.readbundle(ui, fh, bundlepath) |
|
944 | bundle = exchange.readbundle(ui, fh, bundlepath) | |
945 | fn(bundle) |
|
945 | fn(bundle) | |
946 |
|
946 | |||
947 | return run |
|
947 | return run | |
948 |
|
948 | |||
949 | def makereadnbytes(size): |
|
949 | def makereadnbytes(size): | |
950 | def run(): |
|
950 | def run(): | |
951 | with open(bundlepath, b'rb') as fh: |
|
951 | with open(bundlepath, b'rb') as fh: | |
952 | bundle = exchange.readbundle(ui, fh, bundlepath) |
|
952 | bundle = exchange.readbundle(ui, fh, bundlepath) | |
953 | while bundle.read(size): |
|
953 | while bundle.read(size): | |
954 | pass |
|
954 | pass | |
955 |
|
955 | |||
956 | return run |
|
956 | return run | |
957 |
|
957 | |||
958 | def makestdioread(size): |
|
958 | def makestdioread(size): | |
959 | def run(): |
|
959 | def run(): | |
960 | with open(bundlepath, b'rb') as fh: |
|
960 | with open(bundlepath, b'rb') as fh: | |
961 | while fh.read(size): |
|
961 | while fh.read(size): | |
962 | pass |
|
962 | pass | |
963 |
|
963 | |||
964 | return run |
|
964 | return run | |
965 |
|
965 | |||
966 | # bundle1 |
|
966 | # bundle1 | |
967 |
|
967 | |||
968 | def deltaiter(bundle): |
|
968 | def deltaiter(bundle): | |
969 | for delta in bundle.deltaiter(): |
|
969 | for delta in bundle.deltaiter(): | |
970 | pass |
|
970 | pass | |
971 |
|
971 | |||
972 | def iterchunks(bundle): |
|
972 | def iterchunks(bundle): | |
973 | for chunk in bundle.getchunks(): |
|
973 | for chunk in bundle.getchunks(): | |
974 | pass |
|
974 | pass | |
975 |
|
975 | |||
976 | # bundle2 |
|
976 | # bundle2 | |
977 |
|
977 | |||
978 | def forwardchunks(bundle): |
|
978 | def forwardchunks(bundle): | |
979 | for chunk in bundle._forwardchunks(): |
|
979 | for chunk in bundle._forwardchunks(): | |
980 | pass |
|
980 | pass | |
981 |
|
981 | |||
982 | def iterparts(bundle): |
|
982 | def iterparts(bundle): | |
983 | for part in bundle.iterparts(): |
|
983 | for part in bundle.iterparts(): | |
984 | pass |
|
984 | pass | |
985 |
|
985 | |||
986 | def iterpartsseekable(bundle): |
|
986 | def iterpartsseekable(bundle): | |
987 | for part in bundle.iterparts(seekable=True): |
|
987 | for part in bundle.iterparts(seekable=True): | |
988 | pass |
|
988 | pass | |
989 |
|
989 | |||
990 | def seek(bundle): |
|
990 | def seek(bundle): | |
991 | for part in bundle.iterparts(seekable=True): |
|
991 | for part in bundle.iterparts(seekable=True): | |
992 | part.seek(0, os.SEEK_END) |
|
992 | part.seek(0, os.SEEK_END) | |
993 |
|
993 | |||
994 | def makepartreadnbytes(size): |
|
994 | def makepartreadnbytes(size): | |
995 | def run(): |
|
995 | def run(): | |
996 | with open(bundlepath, b'rb') as fh: |
|
996 | with open(bundlepath, b'rb') as fh: | |
997 | bundle = exchange.readbundle(ui, fh, bundlepath) |
|
997 | bundle = exchange.readbundle(ui, fh, bundlepath) | |
998 | for part in bundle.iterparts(): |
|
998 | for part in bundle.iterparts(): | |
999 | while part.read(size): |
|
999 | while part.read(size): | |
1000 | pass |
|
1000 | pass | |
1001 |
|
1001 | |||
1002 | return run |
|
1002 | return run | |
1003 |
|
1003 | |||
1004 | benches = [ |
|
1004 | benches = [ | |
1005 | (makestdioread(8192), b'read(8k)'), |
|
1005 | (makestdioread(8192), b'read(8k)'), | |
1006 | (makestdioread(16384), b'read(16k)'), |
|
1006 | (makestdioread(16384), b'read(16k)'), | |
1007 | (makestdioread(32768), b'read(32k)'), |
|
1007 | (makestdioread(32768), b'read(32k)'), | |
1008 | (makestdioread(131072), b'read(128k)'), |
|
1008 | (makestdioread(131072), b'read(128k)'), | |
1009 | ] |
|
1009 | ] | |
1010 |
|
1010 | |||
1011 | with open(bundlepath, b'rb') as fh: |
|
1011 | with open(bundlepath, b'rb') as fh: | |
1012 | bundle = exchange.readbundle(ui, fh, bundlepath) |
|
1012 | bundle = exchange.readbundle(ui, fh, bundlepath) | |
1013 |
|
1013 | |||
1014 | if isinstance(bundle, changegroup.cg1unpacker): |
|
1014 | if isinstance(bundle, changegroup.cg1unpacker): | |
1015 | benches.extend( |
|
1015 | benches.extend( | |
1016 | [ |
|
1016 | [ | |
1017 | (makebench(deltaiter), b'cg1 deltaiter()'), |
|
1017 | (makebench(deltaiter), b'cg1 deltaiter()'), | |
1018 | (makebench(iterchunks), b'cg1 getchunks()'), |
|
1018 | (makebench(iterchunks), b'cg1 getchunks()'), | |
1019 | (makereadnbytes(8192), b'cg1 read(8k)'), |
|
1019 | (makereadnbytes(8192), b'cg1 read(8k)'), | |
1020 | (makereadnbytes(16384), b'cg1 read(16k)'), |
|
1020 | (makereadnbytes(16384), b'cg1 read(16k)'), | |
1021 | (makereadnbytes(32768), b'cg1 read(32k)'), |
|
1021 | (makereadnbytes(32768), b'cg1 read(32k)'), | |
1022 | (makereadnbytes(131072), b'cg1 read(128k)'), |
|
1022 | (makereadnbytes(131072), b'cg1 read(128k)'), | |
1023 | ] |
|
1023 | ] | |
1024 | ) |
|
1024 | ) | |
1025 | elif isinstance(bundle, bundle2.unbundle20): |
|
1025 | elif isinstance(bundle, bundle2.unbundle20): | |
1026 | benches.extend( |
|
1026 | benches.extend( | |
1027 | [ |
|
1027 | [ | |
1028 | (makebench(forwardchunks), b'bundle2 forwardchunks()'), |
|
1028 | (makebench(forwardchunks), b'bundle2 forwardchunks()'), | |
1029 | (makebench(iterparts), b'bundle2 iterparts()'), |
|
1029 | (makebench(iterparts), b'bundle2 iterparts()'), | |
1030 | ( |
|
1030 | ( | |
1031 | makebench(iterpartsseekable), |
|
1031 | makebench(iterpartsseekable), | |
1032 | b'bundle2 iterparts() seekable', |
|
1032 | b'bundle2 iterparts() seekable', | |
1033 | ), |
|
1033 | ), | |
1034 | (makebench(seek), b'bundle2 part seek()'), |
|
1034 | (makebench(seek), b'bundle2 part seek()'), | |
1035 | (makepartreadnbytes(8192), b'bundle2 part read(8k)'), |
|
1035 | (makepartreadnbytes(8192), b'bundle2 part read(8k)'), | |
1036 | (makepartreadnbytes(16384), b'bundle2 part read(16k)'), |
|
1036 | (makepartreadnbytes(16384), b'bundle2 part read(16k)'), | |
1037 | (makepartreadnbytes(32768), b'bundle2 part read(32k)'), |
|
1037 | (makepartreadnbytes(32768), b'bundle2 part read(32k)'), | |
1038 | (makepartreadnbytes(131072), b'bundle2 part read(128k)'), |
|
1038 | (makepartreadnbytes(131072), b'bundle2 part read(128k)'), | |
1039 | ] |
|
1039 | ] | |
1040 | ) |
|
1040 | ) | |
1041 | elif isinstance(bundle, streamclone.streamcloneapplier): |
|
1041 | elif isinstance(bundle, streamclone.streamcloneapplier): | |
1042 | raise error.Abort(b'stream clone bundles not supported') |
|
1042 | raise error.Abort(b'stream clone bundles not supported') | |
1043 | else: |
|
1043 | else: | |
1044 | raise error.Abort(b'unhandled bundle type: %s' % type(bundle)) |
|
1044 | raise error.Abort(b'unhandled bundle type: %s' % type(bundle)) | |
1045 |
|
1045 | |||
1046 | for fn, title in benches: |
|
1046 | for fn, title in benches: | |
1047 | timer, fm = gettimer(ui, opts) |
|
1047 | timer, fm = gettimer(ui, opts) | |
1048 | timer(fn, title=title) |
|
1048 | timer(fn, title=title) | |
1049 | fm.end() |
|
1049 | fm.end() | |
1050 |
|
1050 | |||
1051 |
|
1051 | |||
1052 | @command( |
|
1052 | @command( | |
1053 | b'perfchangegroupchangelog', |
|
1053 | b'perfchangegroupchangelog', | |
1054 | formatteropts |
|
1054 | formatteropts | |
1055 | + [ |
|
1055 | + [ | |
1056 | (b'', b'cgversion', b'02', b'changegroup version'), |
|
1056 | (b'', b'cgversion', b'02', b'changegroup version'), | |
1057 | (b'r', b'rev', b'', b'revisions to add to changegroup'), |
|
1057 | (b'r', b'rev', b'', b'revisions to add to changegroup'), | |
1058 | ], |
|
1058 | ], | |
1059 | ) |
|
1059 | ) | |
1060 | def perfchangegroupchangelog(ui, repo, cgversion=b'02', rev=None, **opts): |
|
1060 | def perfchangegroupchangelog(ui, repo, cgversion=b'02', rev=None, **opts): | |
1061 | """Benchmark producing a changelog group for a changegroup. |
|
1061 | """Benchmark producing a changelog group for a changegroup. | |
1062 |
|
1062 | |||
1063 | This measures the time spent processing the changelog during a |
|
1063 | This measures the time spent processing the changelog during a | |
1064 | bundle operation. This occurs during `hg bundle` and on a server |
|
1064 | bundle operation. This occurs during `hg bundle` and on a server | |
1065 | processing a `getbundle` wire protocol request (handles clones |
|
1065 | processing a `getbundle` wire protocol request (handles clones | |
1066 | and pull requests). |
|
1066 | and pull requests). | |
1067 |
|
1067 | |||
1068 | By default, all revisions are added to the changegroup. |
|
1068 | By default, all revisions are added to the changegroup. | |
1069 | """ |
|
1069 | """ | |
1070 | opts = _byteskwargs(opts) |
|
1070 | opts = _byteskwargs(opts) | |
1071 | cl = repo.changelog |
|
1071 | cl = repo.changelog | |
1072 | nodes = [cl.lookup(r) for r in repo.revs(rev or b'all()')] |
|
1072 | nodes = [cl.lookup(r) for r in repo.revs(rev or b'all()')] | |
1073 | bundler = changegroup.getbundler(cgversion, repo) |
|
1073 | bundler = changegroup.getbundler(cgversion, repo) | |
1074 |
|
1074 | |||
1075 | def d(): |
|
1075 | def d(): | |
1076 | state, chunks = bundler._generatechangelog(cl, nodes) |
|
1076 | state, chunks = bundler._generatechangelog(cl, nodes) | |
1077 | for chunk in chunks: |
|
1077 | for chunk in chunks: | |
1078 | pass |
|
1078 | pass | |
1079 |
|
1079 | |||
1080 | timer, fm = gettimer(ui, opts) |
|
1080 | timer, fm = gettimer(ui, opts) | |
1081 |
|
1081 | |||
1082 | # Terminal printing can interfere with timing. So disable it. |
|
1082 | # Terminal printing can interfere with timing. So disable it. | |
1083 | with ui.configoverride({(b'progress', b'disable'): True}): |
|
1083 | with ui.configoverride({(b'progress', b'disable'): True}): | |
1084 | timer(d) |
|
1084 | timer(d) | |
1085 |
|
1085 | |||
1086 | fm.end() |
|
1086 | fm.end() | |
1087 |
|
1087 | |||
1088 |
|
1088 | |||
1089 | @command(b'perfdirs', formatteropts) |
|
1089 | @command(b'perfdirs', formatteropts) | |
1090 | def perfdirs(ui, repo, **opts): |
|
1090 | def perfdirs(ui, repo, **opts): | |
1091 | opts = _byteskwargs(opts) |
|
1091 | opts = _byteskwargs(opts) | |
1092 | timer, fm = gettimer(ui, opts) |
|
1092 | timer, fm = gettimer(ui, opts) | |
1093 | dirstate = repo.dirstate |
|
1093 | dirstate = repo.dirstate | |
1094 | b'a' in dirstate |
|
1094 | b'a' in dirstate | |
1095 |
|
1095 | |||
1096 | def d(): |
|
1096 | def d(): | |
1097 | dirstate.hasdir(b'a') |
|
1097 | dirstate.hasdir(b'a') | |
1098 | del dirstate._map._dirs |
|
1098 | del dirstate._map._dirs | |
1099 |
|
1099 | |||
1100 | timer(d) |
|
1100 | timer(d) | |
1101 | fm.end() |
|
1101 | fm.end() | |
1102 |
|
1102 | |||
1103 |
|
1103 | |||
1104 | @command(b'perfdirstate', formatteropts) |
|
1104 | @command(b'perfdirstate', formatteropts) | |
1105 | def perfdirstate(ui, repo, **opts): |
|
1105 | def perfdirstate(ui, repo, **opts): | |
1106 | """benchmap the time necessary to load a dirstate from scratch |
|
1106 | """benchmap the time necessary to load a dirstate from scratch | |
1107 |
|
1107 | |||
1108 | The dirstate is loaded to the point were a "contains" request can be |
|
1108 | The dirstate is loaded to the point were a "contains" request can be | |
1109 | answered. |
|
1109 | answered. | |
1110 | """ |
|
1110 | """ | |
1111 | opts = _byteskwargs(opts) |
|
1111 | opts = _byteskwargs(opts) | |
1112 | timer, fm = gettimer(ui, opts) |
|
1112 | timer, fm = gettimer(ui, opts) | |
1113 | b"a" in repo.dirstate |
|
1113 | b"a" in repo.dirstate | |
1114 |
|
1114 | |||
1115 | def setup(): |
|
1115 | def setup(): | |
1116 | repo.dirstate.invalidate() |
|
1116 | repo.dirstate.invalidate() | |
1117 |
|
1117 | |||
1118 | def d(): |
|
1118 | def d(): | |
1119 | b"a" in repo.dirstate |
|
1119 | b"a" in repo.dirstate | |
1120 |
|
1120 | |||
1121 | timer(d, setup=setup) |
|
1121 | timer(d, setup=setup) | |
1122 | fm.end() |
|
1122 | fm.end() | |
1123 |
|
1123 | |||
1124 |
|
1124 | |||
1125 | @command(b'perfdirstatedirs', formatteropts) |
|
1125 | @command(b'perfdirstatedirs', formatteropts) | |
1126 | def perfdirstatedirs(ui, repo, **opts): |
|
1126 | def perfdirstatedirs(ui, repo, **opts): | |
1127 | """benchmap a 'dirstate.hasdir' call from an empty `dirs` cache |
|
1127 | """benchmap a 'dirstate.hasdir' call from an empty `dirs` cache | |
1128 | """ |
|
1128 | """ | |
1129 | opts = _byteskwargs(opts) |
|
1129 | opts = _byteskwargs(opts) | |
1130 | timer, fm = gettimer(ui, opts) |
|
1130 | timer, fm = gettimer(ui, opts) | |
1131 | repo.dirstate.hasdir(b"a") |
|
1131 | repo.dirstate.hasdir(b"a") | |
1132 |
|
1132 | |||
1133 | def setup(): |
|
1133 | def setup(): | |
1134 | del repo.dirstate._map._dirs |
|
1134 | del repo.dirstate._map._dirs | |
1135 |
|
1135 | |||
1136 | def d(): |
|
1136 | def d(): | |
1137 | repo.dirstate.hasdir(b"a") |
|
1137 | repo.dirstate.hasdir(b"a") | |
1138 |
|
1138 | |||
1139 | timer(d, setup=setup) |
|
1139 | timer(d, setup=setup) | |
1140 | fm.end() |
|
1140 | fm.end() | |
1141 |
|
1141 | |||
1142 |
|
1142 | |||
1143 | @command(b'perfdirstatefoldmap', formatteropts) |
|
1143 | @command(b'perfdirstatefoldmap', formatteropts) | |
1144 | def perfdirstatefoldmap(ui, repo, **opts): |
|
1144 | def perfdirstatefoldmap(ui, repo, **opts): | |
1145 | """benchmap a `dirstate._map.filefoldmap.get()` request |
|
1145 | """benchmap a `dirstate._map.filefoldmap.get()` request | |
1146 |
|
1146 | |||
1147 | The dirstate filefoldmap cache is dropped between every request. |
|
1147 | The dirstate filefoldmap cache is dropped between every request. | |
1148 | """ |
|
1148 | """ | |
1149 | opts = _byteskwargs(opts) |
|
1149 | opts = _byteskwargs(opts) | |
1150 | timer, fm = gettimer(ui, opts) |
|
1150 | timer, fm = gettimer(ui, opts) | |
1151 | dirstate = repo.dirstate |
|
1151 | dirstate = repo.dirstate | |
1152 | dirstate._map.filefoldmap.get(b'a') |
|
1152 | dirstate._map.filefoldmap.get(b'a') | |
1153 |
|
1153 | |||
1154 | def setup(): |
|
1154 | def setup(): | |
1155 | del dirstate._map.filefoldmap |
|
1155 | del dirstate._map.filefoldmap | |
1156 |
|
1156 | |||
1157 | def d(): |
|
1157 | def d(): | |
1158 | dirstate._map.filefoldmap.get(b'a') |
|
1158 | dirstate._map.filefoldmap.get(b'a') | |
1159 |
|
1159 | |||
1160 | timer(d, setup=setup) |
|
1160 | timer(d, setup=setup) | |
1161 | fm.end() |
|
1161 | fm.end() | |
1162 |
|
1162 | |||
1163 |
|
1163 | |||
1164 | @command(b'perfdirfoldmap', formatteropts) |
|
1164 | @command(b'perfdirfoldmap', formatteropts) | |
1165 | def perfdirfoldmap(ui, repo, **opts): |
|
1165 | def perfdirfoldmap(ui, repo, **opts): | |
1166 | """benchmap a `dirstate._map.dirfoldmap.get()` request |
|
1166 | """benchmap a `dirstate._map.dirfoldmap.get()` request | |
1167 |
|
1167 | |||
1168 | The dirstate dirfoldmap cache is dropped between every request. |
|
1168 | The dirstate dirfoldmap cache is dropped between every request. | |
1169 | """ |
|
1169 | """ | |
1170 | opts = _byteskwargs(opts) |
|
1170 | opts = _byteskwargs(opts) | |
1171 | timer, fm = gettimer(ui, opts) |
|
1171 | timer, fm = gettimer(ui, opts) | |
1172 | dirstate = repo.dirstate |
|
1172 | dirstate = repo.dirstate | |
1173 | dirstate._map.dirfoldmap.get(b'a') |
|
1173 | dirstate._map.dirfoldmap.get(b'a') | |
1174 |
|
1174 | |||
1175 | def setup(): |
|
1175 | def setup(): | |
1176 | del dirstate._map.dirfoldmap |
|
1176 | del dirstate._map.dirfoldmap | |
1177 | del dirstate._map._dirs |
|
1177 | del dirstate._map._dirs | |
1178 |
|
1178 | |||
1179 | def d(): |
|
1179 | def d(): | |
1180 | dirstate._map.dirfoldmap.get(b'a') |
|
1180 | dirstate._map.dirfoldmap.get(b'a') | |
1181 |
|
1181 | |||
1182 | timer(d, setup=setup) |
|
1182 | timer(d, setup=setup) | |
1183 | fm.end() |
|
1183 | fm.end() | |
1184 |
|
1184 | |||
1185 |
|
1185 | |||
1186 | @command(b'perfdirstatewrite', formatteropts) |
|
1186 | @command(b'perfdirstatewrite', formatteropts) | |
1187 | def perfdirstatewrite(ui, repo, **opts): |
|
1187 | def perfdirstatewrite(ui, repo, **opts): | |
1188 | """benchmap the time it take to write a dirstate on disk |
|
1188 | """benchmap the time it take to write a dirstate on disk | |
1189 | """ |
|
1189 | """ | |
1190 | opts = _byteskwargs(opts) |
|
1190 | opts = _byteskwargs(opts) | |
1191 | timer, fm = gettimer(ui, opts) |
|
1191 | timer, fm = gettimer(ui, opts) | |
1192 | ds = repo.dirstate |
|
1192 | ds = repo.dirstate | |
1193 | b"a" in ds |
|
1193 | b"a" in ds | |
1194 |
|
1194 | |||
1195 | def setup(): |
|
1195 | def setup(): | |
1196 | ds._dirty = True |
|
1196 | ds._dirty = True | |
1197 |
|
1197 | |||
1198 | def d(): |
|
1198 | def d(): | |
1199 | ds.write(repo.currenttransaction()) |
|
1199 | ds.write(repo.currenttransaction()) | |
1200 |
|
1200 | |||
1201 | timer(d, setup=setup) |
|
1201 | timer(d, setup=setup) | |
1202 | fm.end() |
|
1202 | fm.end() | |
1203 |
|
1203 | |||
1204 |
|
1204 | |||
1205 | def _getmergerevs(repo, opts): |
|
1205 | def _getmergerevs(repo, opts): | |
1206 | """parse command argument to return rev involved in merge |
|
1206 | """parse command argument to return rev involved in merge | |
1207 |
|
1207 | |||
1208 | input: options dictionnary with `rev`, `from` and `bse` |
|
1208 | input: options dictionnary with `rev`, `from` and `bse` | |
1209 | output: (localctx, otherctx, basectx) |
|
1209 | output: (localctx, otherctx, basectx) | |
1210 | """ |
|
1210 | """ | |
1211 | if opts[b'from']: |
|
1211 | if opts[b'from']: | |
1212 | fromrev = scmutil.revsingle(repo, opts[b'from']) |
|
1212 | fromrev = scmutil.revsingle(repo, opts[b'from']) | |
1213 | wctx = repo[fromrev] |
|
1213 | wctx = repo[fromrev] | |
1214 | else: |
|
1214 | else: | |
1215 | wctx = repo[None] |
|
1215 | wctx = repo[None] | |
1216 | # we don't want working dir files to be stat'd in the benchmark, so |
|
1216 | # we don't want working dir files to be stat'd in the benchmark, so | |
1217 | # prime that cache |
|
1217 | # prime that cache | |
1218 | wctx.dirty() |
|
1218 | wctx.dirty() | |
1219 | rctx = scmutil.revsingle(repo, opts[b'rev'], opts[b'rev']) |
|
1219 | rctx = scmutil.revsingle(repo, opts[b'rev'], opts[b'rev']) | |
1220 | if opts[b'base']: |
|
1220 | if opts[b'base']: | |
1221 | fromrev = scmutil.revsingle(repo, opts[b'base']) |
|
1221 | fromrev = scmutil.revsingle(repo, opts[b'base']) | |
1222 | ancestor = repo[fromrev] |
|
1222 | ancestor = repo[fromrev] | |
1223 | else: |
|
1223 | else: | |
1224 | ancestor = wctx.ancestor(rctx) |
|
1224 | ancestor = wctx.ancestor(rctx) | |
1225 | return (wctx, rctx, ancestor) |
|
1225 | return (wctx, rctx, ancestor) | |
1226 |
|
1226 | |||
1227 |
|
1227 | |||
1228 | @command( |
|
1228 | @command( | |
1229 | b'perfmergecalculate', |
|
1229 | b'perfmergecalculate', | |
1230 | [ |
|
1230 | [ | |
1231 | (b'r', b'rev', b'.', b'rev to merge against'), |
|
1231 | (b'r', b'rev', b'.', b'rev to merge against'), | |
1232 | (b'', b'from', b'', b'rev to merge from'), |
|
1232 | (b'', b'from', b'', b'rev to merge from'), | |
1233 | (b'', b'base', b'', b'the revision to use as base'), |
|
1233 | (b'', b'base', b'', b'the revision to use as base'), | |
1234 | ] |
|
1234 | ] | |
1235 | + formatteropts, |
|
1235 | + formatteropts, | |
1236 | ) |
|
1236 | ) | |
1237 | def perfmergecalculate(ui, repo, **opts): |
|
1237 | def perfmergecalculate(ui, repo, **opts): | |
1238 | opts = _byteskwargs(opts) |
|
1238 | opts = _byteskwargs(opts) | |
1239 | timer, fm = gettimer(ui, opts) |
|
1239 | timer, fm = gettimer(ui, opts) | |
1240 |
|
1240 | |||
1241 | wctx, rctx, ancestor = _getmergerevs(repo, opts) |
|
1241 | wctx, rctx, ancestor = _getmergerevs(repo, opts) | |
1242 |
|
1242 | |||
1243 | def d(): |
|
1243 | def d(): | |
1244 | # acceptremote is True because we don't want prompts in the middle of |
|
1244 | # acceptremote is True because we don't want prompts in the middle of | |
1245 | # our benchmark |
|
1245 | # our benchmark | |
1246 | merge.calculateupdates( |
|
1246 | merge.calculateupdates( | |
1247 | repo, |
|
1247 | repo, | |
1248 | wctx, |
|
1248 | wctx, | |
1249 | rctx, |
|
1249 | rctx, | |
1250 | [ancestor], |
|
1250 | [ancestor], | |
1251 | branchmerge=False, |
|
1251 | branchmerge=False, | |
1252 | force=False, |
|
1252 | force=False, | |
1253 | acceptremote=True, |
|
1253 | acceptremote=True, | |
1254 | followcopies=True, |
|
1254 | followcopies=True, | |
1255 | ) |
|
1255 | ) | |
1256 |
|
1256 | |||
1257 | timer(d) |
|
1257 | timer(d) | |
1258 | fm.end() |
|
1258 | fm.end() | |
1259 |
|
1259 | |||
1260 |
|
1260 | |||
1261 | @command( |
|
1261 | @command( | |
1262 | b'perfmergecopies', |
|
1262 | b'perfmergecopies', | |
1263 | [ |
|
1263 | [ | |
1264 | (b'r', b'rev', b'.', b'rev to merge against'), |
|
1264 | (b'r', b'rev', b'.', b'rev to merge against'), | |
1265 | (b'', b'from', b'', b'rev to merge from'), |
|
1265 | (b'', b'from', b'', b'rev to merge from'), | |
1266 | (b'', b'base', b'', b'the revision to use as base'), |
|
1266 | (b'', b'base', b'', b'the revision to use as base'), | |
1267 | ] |
|
1267 | ] | |
1268 | + formatteropts, |
|
1268 | + formatteropts, | |
1269 | ) |
|
1269 | ) | |
1270 | def perfmergecopies(ui, repo, **opts): |
|
1270 | def perfmergecopies(ui, repo, **opts): | |
1271 | """measure runtime of `copies.mergecopies`""" |
|
1271 | """measure runtime of `copies.mergecopies`""" | |
1272 | opts = _byteskwargs(opts) |
|
1272 | opts = _byteskwargs(opts) | |
1273 | timer, fm = gettimer(ui, opts) |
|
1273 | timer, fm = gettimer(ui, opts) | |
1274 | wctx, rctx, ancestor = _getmergerevs(repo, opts) |
|
1274 | wctx, rctx, ancestor = _getmergerevs(repo, opts) | |
1275 |
|
1275 | |||
1276 | def d(): |
|
1276 | def d(): | |
1277 | # acceptremote is True because we don't want prompts in the middle of |
|
1277 | # acceptremote is True because we don't want prompts in the middle of | |
1278 | # our benchmark |
|
1278 | # our benchmark | |
1279 | copies.mergecopies(repo, wctx, rctx, ancestor) |
|
1279 | copies.mergecopies(repo, wctx, rctx, ancestor) | |
1280 |
|
1280 | |||
1281 | timer(d) |
|
1281 | timer(d) | |
1282 | fm.end() |
|
1282 | fm.end() | |
1283 |
|
1283 | |||
1284 |
|
1284 | |||
1285 | @command(b'perfpathcopies', [], b"REV REV") |
|
1285 | @command(b'perfpathcopies', [], b"REV REV") | |
1286 | def perfpathcopies(ui, repo, rev1, rev2, **opts): |
|
1286 | def perfpathcopies(ui, repo, rev1, rev2, **opts): | |
1287 | """benchmark the copy tracing logic""" |
|
1287 | """benchmark the copy tracing logic""" | |
1288 | opts = _byteskwargs(opts) |
|
1288 | opts = _byteskwargs(opts) | |
1289 | timer, fm = gettimer(ui, opts) |
|
1289 | timer, fm = gettimer(ui, opts) | |
1290 | ctx1 = scmutil.revsingle(repo, rev1, rev1) |
|
1290 | ctx1 = scmutil.revsingle(repo, rev1, rev1) | |
1291 | ctx2 = scmutil.revsingle(repo, rev2, rev2) |
|
1291 | ctx2 = scmutil.revsingle(repo, rev2, rev2) | |
1292 |
|
1292 | |||
1293 | def d(): |
|
1293 | def d(): | |
1294 | copies.pathcopies(ctx1, ctx2) |
|
1294 | copies.pathcopies(ctx1, ctx2) | |
1295 |
|
1295 | |||
1296 | timer(d) |
|
1296 | timer(d) | |
1297 | fm.end() |
|
1297 | fm.end() | |
1298 |
|
1298 | |||
1299 |
|
1299 | |||
1300 | @command( |
|
1300 | @command( | |
1301 | b'perfphases', |
|
1301 | b'perfphases', | |
1302 | [(b'', b'full', False, b'include file reading time too'),], |
|
1302 | [(b'', b'full', False, b'include file reading time too'),], | |
1303 | b"", |
|
1303 | b"", | |
1304 | ) |
|
1304 | ) | |
1305 | def perfphases(ui, repo, **opts): |
|
1305 | def perfphases(ui, repo, **opts): | |
1306 | """benchmark phasesets computation""" |
|
1306 | """benchmark phasesets computation""" | |
1307 | opts = _byteskwargs(opts) |
|
1307 | opts = _byteskwargs(opts) | |
1308 | timer, fm = gettimer(ui, opts) |
|
1308 | timer, fm = gettimer(ui, opts) | |
1309 | _phases = repo._phasecache |
|
1309 | _phases = repo._phasecache | |
1310 | full = opts.get(b'full') |
|
1310 | full = opts.get(b'full') | |
1311 |
|
1311 | |||
1312 | def d(): |
|
1312 | def d(): | |
1313 | phases = _phases |
|
1313 | phases = _phases | |
1314 | if full: |
|
1314 | if full: | |
1315 | clearfilecache(repo, b'_phasecache') |
|
1315 | clearfilecache(repo, b'_phasecache') | |
1316 | phases = repo._phasecache |
|
1316 | phases = repo._phasecache | |
1317 | phases.invalidate() |
|
1317 | phases.invalidate() | |
1318 | phases.loadphaserevs(repo) |
|
1318 | phases.loadphaserevs(repo) | |
1319 |
|
1319 | |||
1320 | timer(d) |
|
1320 | timer(d) | |
1321 | fm.end() |
|
1321 | fm.end() | |
1322 |
|
1322 | |||
1323 |
|
1323 | |||
1324 | @command(b'perfphasesremote', [], b"[DEST]") |
|
1324 | @command(b'perfphasesremote', [], b"[DEST]") | |
1325 | def perfphasesremote(ui, repo, dest=None, **opts): |
|
1325 | def perfphasesremote(ui, repo, dest=None, **opts): | |
1326 | """benchmark time needed to analyse phases of the remote server""" |
|
1326 | """benchmark time needed to analyse phases of the remote server""" | |
1327 | from mercurial.node import bin |
|
1327 | from mercurial.node import bin | |
1328 | from mercurial import ( |
|
1328 | from mercurial import ( | |
1329 | exchange, |
|
1329 | exchange, | |
1330 | hg, |
|
1330 | hg, | |
1331 | phases, |
|
1331 | phases, | |
1332 | ) |
|
1332 | ) | |
1333 |
|
1333 | |||
1334 | opts = _byteskwargs(opts) |
|
1334 | opts = _byteskwargs(opts) | |
1335 | timer, fm = gettimer(ui, opts) |
|
1335 | timer, fm = gettimer(ui, opts) | |
1336 |
|
1336 | |||
1337 | path = ui.paths.getpath(dest, default=(b'default-push', b'default')) |
|
1337 | path = ui.paths.getpath(dest, default=(b'default-push', b'default')) | |
1338 | if not path: |
|
1338 | if not path: | |
1339 | raise error.Abort( |
|
1339 | raise error.Abort( | |
1340 | b'default repository not configured!', |
|
1340 | b'default repository not configured!', | |
1341 | hint=b"see 'hg help config.paths'", |
|
1341 | hint=b"see 'hg help config.paths'", | |
1342 | ) |
|
1342 | ) | |
1343 | dest = path.pushloc or path.loc |
|
1343 | dest = path.pushloc or path.loc | |
1344 | ui.statusnoi18n(b'analysing phase of %s\n' % util.hidepassword(dest)) |
|
1344 | ui.statusnoi18n(b'analysing phase of %s\n' % util.hidepassword(dest)) | |
1345 | other = hg.peer(repo, opts, dest) |
|
1345 | other = hg.peer(repo, opts, dest) | |
1346 |
|
1346 | |||
1347 | # easier to perform discovery through the operation |
|
1347 | # easier to perform discovery through the operation | |
1348 | op = exchange.pushoperation(repo, other) |
|
1348 | op = exchange.pushoperation(repo, other) | |
1349 | exchange._pushdiscoverychangeset(op) |
|
1349 | exchange._pushdiscoverychangeset(op) | |
1350 |
|
1350 | |||
1351 | remotesubset = op.fallbackheads |
|
1351 | remotesubset = op.fallbackheads | |
1352 |
|
1352 | |||
1353 | with other.commandexecutor() as e: |
|
1353 | with other.commandexecutor() as e: | |
1354 | remotephases = e.callcommand( |
|
1354 | remotephases = e.callcommand( | |
1355 | b'listkeys', {b'namespace': b'phases'} |
|
1355 | b'listkeys', {b'namespace': b'phases'} | |
1356 | ).result() |
|
1356 | ).result() | |
1357 | del other |
|
1357 | del other | |
1358 | publishing = remotephases.get(b'publishing', False) |
|
1358 | publishing = remotephases.get(b'publishing', False) | |
1359 | if publishing: |
|
1359 | if publishing: | |
1360 | ui.statusnoi18n(b'publishing: yes\n') |
|
1360 | ui.statusnoi18n(b'publishing: yes\n') | |
1361 | else: |
|
1361 | else: | |
1362 | ui.statusnoi18n(b'publishing: no\n') |
|
1362 | ui.statusnoi18n(b'publishing: no\n') | |
1363 |
|
1363 | |||
1364 | nodemap = repo.changelog.nodemap |
|
1364 | nodemap = repo.changelog.nodemap | |
1365 | nonpublishroots = 0 |
|
1365 | nonpublishroots = 0 | |
1366 | for nhex, phase in remotephases.iteritems(): |
|
1366 | for nhex, phase in remotephases.iteritems(): | |
1367 | if nhex == b'publishing': # ignore data related to publish option |
|
1367 | if nhex == b'publishing': # ignore data related to publish option | |
1368 | continue |
|
1368 | continue | |
1369 | node = bin(nhex) |
|
1369 | node = bin(nhex) | |
1370 | if node in nodemap and int(phase): |
|
1370 | if node in nodemap and int(phase): | |
1371 | nonpublishroots += 1 |
|
1371 | nonpublishroots += 1 | |
1372 | ui.statusnoi18n(b'number of roots: %d\n' % len(remotephases)) |
|
1372 | ui.statusnoi18n(b'number of roots: %d\n' % len(remotephases)) | |
1373 | ui.statusnoi18n(b'number of known non public roots: %d\n' % nonpublishroots) |
|
1373 | ui.statusnoi18n(b'number of known non public roots: %d\n' % nonpublishroots) | |
1374 |
|
1374 | |||
1375 | def d(): |
|
1375 | def d(): | |
1376 | phases.remotephasessummary(repo, remotesubset, remotephases) |
|
1376 | phases.remotephasessummary(repo, remotesubset, remotephases) | |
1377 |
|
1377 | |||
1378 | timer(d) |
|
1378 | timer(d) | |
1379 | fm.end() |
|
1379 | fm.end() | |
1380 |
|
1380 | |||
1381 |
|
1381 | |||
1382 | @command( |
|
1382 | @command( | |
1383 | b'perfmanifest', |
|
1383 | b'perfmanifest', | |
1384 | [ |
|
1384 | [ | |
1385 | (b'm', b'manifest-rev', False, b'Look up a manifest node revision'), |
|
1385 | (b'm', b'manifest-rev', False, b'Look up a manifest node revision'), | |
1386 | (b'', b'clear-disk', False, b'clear on-disk caches too'), |
|
1386 | (b'', b'clear-disk', False, b'clear on-disk caches too'), | |
1387 | ] |
|
1387 | ] | |
1388 | + formatteropts, |
|
1388 | + formatteropts, | |
1389 | b'REV|NODE', |
|
1389 | b'REV|NODE', | |
1390 | ) |
|
1390 | ) | |
1391 | def perfmanifest(ui, repo, rev, manifest_rev=False, clear_disk=False, **opts): |
|
1391 | def perfmanifest(ui, repo, rev, manifest_rev=False, clear_disk=False, **opts): | |
1392 | """benchmark the time to read a manifest from disk and return a usable |
|
1392 | """benchmark the time to read a manifest from disk and return a usable | |
1393 | dict-like object |
|
1393 | dict-like object | |
1394 |
|
1394 | |||
1395 | Manifest caches are cleared before retrieval.""" |
|
1395 | Manifest caches are cleared before retrieval.""" | |
1396 | opts = _byteskwargs(opts) |
|
1396 | opts = _byteskwargs(opts) | |
1397 | timer, fm = gettimer(ui, opts) |
|
1397 | timer, fm = gettimer(ui, opts) | |
1398 | if not manifest_rev: |
|
1398 | if not manifest_rev: | |
1399 | ctx = scmutil.revsingle(repo, rev, rev) |
|
1399 | ctx = scmutil.revsingle(repo, rev, rev) | |
1400 | t = ctx.manifestnode() |
|
1400 | t = ctx.manifestnode() | |
1401 | else: |
|
1401 | else: | |
1402 | from mercurial.node import bin |
|
1402 | from mercurial.node import bin | |
1403 |
|
1403 | |||
1404 | if len(rev) == 40: |
|
1404 | if len(rev) == 40: | |
1405 | t = bin(rev) |
|
1405 | t = bin(rev) | |
1406 | else: |
|
1406 | else: | |
1407 | try: |
|
1407 | try: | |
1408 | rev = int(rev) |
|
1408 | rev = int(rev) | |
1409 |
|
1409 | |||
1410 | if util.safehasattr(repo.manifestlog, b'getstorage'): |
|
1410 | if util.safehasattr(repo.manifestlog, b'getstorage'): | |
1411 | t = repo.manifestlog.getstorage(b'').node(rev) |
|
1411 | t = repo.manifestlog.getstorage(b'').node(rev) | |
1412 | else: |
|
1412 | else: | |
1413 | t = repo.manifestlog._revlog.lookup(rev) |
|
1413 | t = repo.manifestlog._revlog.lookup(rev) | |
1414 | except ValueError: |
|
1414 | except ValueError: | |
1415 | raise error.Abort( |
|
1415 | raise error.Abort( | |
1416 | b'manifest revision must be integer or full node' |
|
1416 | b'manifest revision must be integer or full node' | |
1417 | ) |
|
1417 | ) | |
1418 |
|
1418 | |||
1419 | def d(): |
|
1419 | def d(): | |
1420 | repo.manifestlog.clearcaches(clear_persisted_data=clear_disk) |
|
1420 | repo.manifestlog.clearcaches(clear_persisted_data=clear_disk) | |
1421 | repo.manifestlog[t].read() |
|
1421 | repo.manifestlog[t].read() | |
1422 |
|
1422 | |||
1423 | timer(d) |
|
1423 | timer(d) | |
1424 | fm.end() |
|
1424 | fm.end() | |
1425 |
|
1425 | |||
1426 |
|
1426 | |||
1427 | @command(b'perfchangeset', formatteropts) |
|
1427 | @command(b'perfchangeset', formatteropts) | |
1428 | def perfchangeset(ui, repo, rev, **opts): |
|
1428 | def perfchangeset(ui, repo, rev, **opts): | |
1429 | opts = _byteskwargs(opts) |
|
1429 | opts = _byteskwargs(opts) | |
1430 | timer, fm = gettimer(ui, opts) |
|
1430 | timer, fm = gettimer(ui, opts) | |
1431 | n = scmutil.revsingle(repo, rev).node() |
|
1431 | n = scmutil.revsingle(repo, rev).node() | |
1432 |
|
1432 | |||
1433 | def d(): |
|
1433 | def d(): | |
1434 | repo.changelog.read(n) |
|
1434 | repo.changelog.read(n) | |
1435 | # repo.changelog._cache = None |
|
1435 | # repo.changelog._cache = None | |
1436 |
|
1436 | |||
1437 | timer(d) |
|
1437 | timer(d) | |
1438 | fm.end() |
|
1438 | fm.end() | |
1439 |
|
1439 | |||
1440 |
|
1440 | |||
1441 | @command(b'perfignore', formatteropts) |
|
1441 | @command(b'perfignore', formatteropts) | |
1442 | def perfignore(ui, repo, **opts): |
|
1442 | def perfignore(ui, repo, **opts): | |
1443 | """benchmark operation related to computing ignore""" |
|
1443 | """benchmark operation related to computing ignore""" | |
1444 | opts = _byteskwargs(opts) |
|
1444 | opts = _byteskwargs(opts) | |
1445 | timer, fm = gettimer(ui, opts) |
|
1445 | timer, fm = gettimer(ui, opts) | |
1446 | dirstate = repo.dirstate |
|
1446 | dirstate = repo.dirstate | |
1447 |
|
1447 | |||
1448 | def setupone(): |
|
1448 | def setupone(): | |
1449 | dirstate.invalidate() |
|
1449 | dirstate.invalidate() | |
1450 | clearfilecache(dirstate, b'_ignore') |
|
1450 | clearfilecache(dirstate, b'_ignore') | |
1451 |
|
1451 | |||
1452 | def runone(): |
|
1452 | def runone(): | |
1453 | dirstate._ignore |
|
1453 | dirstate._ignore | |
1454 |
|
1454 | |||
1455 | timer(runone, setup=setupone, title=b"load") |
|
1455 | timer(runone, setup=setupone, title=b"load") | |
1456 | fm.end() |
|
1456 | fm.end() | |
1457 |
|
1457 | |||
1458 |
|
1458 | |||
1459 | @command( |
|
1459 | @command( | |
1460 | b'perfindex', |
|
1460 | b'perfindex', | |
1461 | [ |
|
1461 | [ | |
1462 | (b'', b'rev', [], b'revision to be looked up (default tip)'), |
|
1462 | (b'', b'rev', [], b'revision to be looked up (default tip)'), | |
1463 | (b'', b'no-lookup', None, b'do not revision lookup post creation'), |
|
1463 | (b'', b'no-lookup', None, b'do not revision lookup post creation'), | |
1464 | ] |
|
1464 | ] | |
1465 | + formatteropts, |
|
1465 | + formatteropts, | |
1466 | ) |
|
1466 | ) | |
1467 | def perfindex(ui, repo, **opts): |
|
1467 | def perfindex(ui, repo, **opts): | |
1468 | """benchmark index creation time followed by a lookup |
|
1468 | """benchmark index creation time followed by a lookup | |
1469 |
|
1469 | |||
1470 | The default is to look `tip` up. Depending on the index implementation, |
|
1470 | The default is to look `tip` up. Depending on the index implementation, | |
1471 | the revision looked up can matters. For example, an implementation |
|
1471 | the revision looked up can matters. For example, an implementation | |
1472 | scanning the index will have a faster lookup time for `--rev tip` than for |
|
1472 | scanning the index will have a faster lookup time for `--rev tip` than for | |
1473 | `--rev 0`. The number of looked up revisions and their order can also |
|
1473 | `--rev 0`. The number of looked up revisions and their order can also | |
1474 | matters. |
|
1474 | matters. | |
1475 |
|
1475 | |||
1476 | Example of useful set to test: |
|
1476 | Example of useful set to test: | |
1477 | * tip |
|
1477 | * tip | |
1478 | * 0 |
|
1478 | * 0 | |
1479 | * -10: |
|
1479 | * -10: | |
1480 | * :10 |
|
1480 | * :10 | |
1481 | * -10: + :10 |
|
1481 | * -10: + :10 | |
1482 | * :10: + -10: |
|
1482 | * :10: + -10: | |
1483 | * -10000: |
|
1483 | * -10000: | |
1484 | * -10000: + 0 |
|
1484 | * -10000: + 0 | |
1485 |
|
1485 | |||
1486 | It is not currently possible to check for lookup of a missing node. For |
|
1486 | It is not currently possible to check for lookup of a missing node. For | |
1487 | deeper lookup benchmarking, checkout the `perfnodemap` command.""" |
|
1487 | deeper lookup benchmarking, checkout the `perfnodemap` command.""" | |
1488 | import mercurial.revlog |
|
1488 | import mercurial.revlog | |
1489 |
|
1489 | |||
1490 | opts = _byteskwargs(opts) |
|
1490 | opts = _byteskwargs(opts) | |
1491 | timer, fm = gettimer(ui, opts) |
|
1491 | timer, fm = gettimer(ui, opts) | |
1492 | mercurial.revlog._prereadsize = 2 ** 24 # disable lazy parser in old hg |
|
1492 | mercurial.revlog._prereadsize = 2 ** 24 # disable lazy parser in old hg | |
1493 | if opts[b'no_lookup']: |
|
1493 | if opts[b'no_lookup']: | |
1494 | if opts['rev']: |
|
1494 | if opts['rev']: | |
1495 | raise error.Abort('--no-lookup and --rev are mutually exclusive') |
|
1495 | raise error.Abort('--no-lookup and --rev are mutually exclusive') | |
1496 | nodes = [] |
|
1496 | nodes = [] | |
1497 | elif not opts[b'rev']: |
|
1497 | elif not opts[b'rev']: | |
1498 | nodes = [repo[b"tip"].node()] |
|
1498 | nodes = [repo[b"tip"].node()] | |
1499 | else: |
|
1499 | else: | |
1500 | revs = scmutil.revrange(repo, opts[b'rev']) |
|
1500 | revs = scmutil.revrange(repo, opts[b'rev']) | |
1501 | cl = repo.changelog |
|
1501 | cl = repo.changelog | |
1502 | nodes = [cl.node(r) for r in revs] |
|
1502 | nodes = [cl.node(r) for r in revs] | |
1503 |
|
1503 | |||
1504 | unfi = repo.unfiltered() |
|
1504 | unfi = repo.unfiltered() | |
1505 | # find the filecache func directly |
|
1505 | # find the filecache func directly | |
1506 | # This avoid polluting the benchmark with the filecache logic |
|
1506 | # This avoid polluting the benchmark with the filecache logic | |
1507 | makecl = unfi.__class__.changelog.func |
|
1507 | makecl = unfi.__class__.changelog.func | |
1508 |
|
1508 | |||
1509 | def setup(): |
|
1509 | def setup(): | |
1510 | # probably not necessary, but for good measure |
|
1510 | # probably not necessary, but for good measure | |
1511 | clearchangelog(unfi) |
|
1511 | clearchangelog(unfi) | |
1512 |
|
1512 | |||
1513 | def d(): |
|
1513 | def d(): | |
1514 | cl = makecl(unfi) |
|
1514 | cl = makecl(unfi) | |
1515 | for n in nodes: |
|
1515 | for n in nodes: | |
1516 | cl.rev(n) |
|
1516 | cl.rev(n) | |
1517 |
|
1517 | |||
1518 | timer(d, setup=setup) |
|
1518 | timer(d, setup=setup) | |
1519 | fm.end() |
|
1519 | fm.end() | |
1520 |
|
1520 | |||
1521 |
|
1521 | |||
1522 | @command( |
|
1522 | @command( | |
1523 | b'perfnodemap', |
|
1523 | b'perfnodemap', | |
1524 | [ |
|
1524 | [ | |
1525 | (b'', b'rev', [], b'revision to be looked up (default tip)'), |
|
1525 | (b'', b'rev', [], b'revision to be looked up (default tip)'), | |
1526 | (b'', b'clear-caches', True, b'clear revlog cache between calls'), |
|
1526 | (b'', b'clear-caches', True, b'clear revlog cache between calls'), | |
1527 | ] |
|
1527 | ] | |
1528 | + formatteropts, |
|
1528 | + formatteropts, | |
1529 | ) |
|
1529 | ) | |
1530 | def perfnodemap(ui, repo, **opts): |
|
1530 | def perfnodemap(ui, repo, **opts): | |
1531 | """benchmark the time necessary to look up revision from a cold nodemap |
|
1531 | """benchmark the time necessary to look up revision from a cold nodemap | |
1532 |
|
1532 | |||
1533 | Depending on the implementation, the amount and order of revision we look |
|
1533 | Depending on the implementation, the amount and order of revision we look | |
1534 | up can varies. Example of useful set to test: |
|
1534 | up can varies. Example of useful set to test: | |
1535 | * tip |
|
1535 | * tip | |
1536 | * 0 |
|
1536 | * 0 | |
1537 | * -10: |
|
1537 | * -10: | |
1538 | * :10 |
|
1538 | * :10 | |
1539 | * -10: + :10 |
|
1539 | * -10: + :10 | |
1540 | * :10: + -10: |
|
1540 | * :10: + -10: | |
1541 | * -10000: |
|
1541 | * -10000: | |
1542 | * -10000: + 0 |
|
1542 | * -10000: + 0 | |
1543 |
|
1543 | |||
1544 | The command currently focus on valid binary lookup. Benchmarking for |
|
1544 | The command currently focus on valid binary lookup. Benchmarking for | |
1545 | hexlookup, prefix lookup and missing lookup would also be valuable. |
|
1545 | hexlookup, prefix lookup and missing lookup would also be valuable. | |
1546 | """ |
|
1546 | """ | |
1547 | import mercurial.revlog |
|
1547 | import mercurial.revlog | |
1548 |
|
1548 | |||
1549 | opts = _byteskwargs(opts) |
|
1549 | opts = _byteskwargs(opts) | |
1550 | timer, fm = gettimer(ui, opts) |
|
1550 | timer, fm = gettimer(ui, opts) | |
1551 | mercurial.revlog._prereadsize = 2 ** 24 # disable lazy parser in old hg |
|
1551 | mercurial.revlog._prereadsize = 2 ** 24 # disable lazy parser in old hg | |
1552 |
|
1552 | |||
1553 | unfi = repo.unfiltered() |
|
1553 | unfi = repo.unfiltered() | |
1554 | clearcaches = opts['clear_caches'] |
|
1554 | clearcaches = opts['clear_caches'] | |
1555 | # find the filecache func directly |
|
1555 | # find the filecache func directly | |
1556 | # This avoid polluting the benchmark with the filecache logic |
|
1556 | # This avoid polluting the benchmark with the filecache logic | |
1557 | makecl = unfi.__class__.changelog.func |
|
1557 | makecl = unfi.__class__.changelog.func | |
1558 | if not opts[b'rev']: |
|
1558 | if not opts[b'rev']: | |
1559 | raise error.Abort('use --rev to specify revisions to look up') |
|
1559 | raise error.Abort('use --rev to specify revisions to look up') | |
1560 | revs = scmutil.revrange(repo, opts[b'rev']) |
|
1560 | revs = scmutil.revrange(repo, opts[b'rev']) | |
1561 | cl = repo.changelog |
|
1561 | cl = repo.changelog | |
1562 | nodes = [cl.node(r) for r in revs] |
|
1562 | nodes = [cl.node(r) for r in revs] | |
1563 |
|
1563 | |||
1564 | # use a list to pass reference to a nodemap from one closure to the next |
|
1564 | # use a list to pass reference to a nodemap from one closure to the next | |
1565 | nodeget = [None] |
|
1565 | nodeget = [None] | |
1566 |
|
1566 | |||
1567 | def setnodeget(): |
|
1567 | def setnodeget(): | |
1568 | # probably not necessary, but for good measure |
|
1568 | # probably not necessary, but for good measure | |
1569 | clearchangelog(unfi) |
|
1569 | clearchangelog(unfi) | |
1570 | nodeget[0] = makecl(unfi).nodemap.get |
|
1570 | nodeget[0] = makecl(unfi).nodemap.get | |
1571 |
|
1571 | |||
1572 | def d(): |
|
1572 | def d(): | |
1573 | get = nodeget[0] |
|
1573 | get = nodeget[0] | |
1574 | for n in nodes: |
|
1574 | for n in nodes: | |
1575 | get(n) |
|
1575 | get(n) | |
1576 |
|
1576 | |||
1577 | setup = None |
|
1577 | setup = None | |
1578 | if clearcaches: |
|
1578 | if clearcaches: | |
1579 |
|
1579 | |||
1580 | def setup(): |
|
1580 | def setup(): | |
1581 | setnodeget() |
|
1581 | setnodeget() | |
1582 |
|
1582 | |||
1583 | else: |
|
1583 | else: | |
1584 | setnodeget() |
|
1584 | setnodeget() | |
1585 | d() # prewarm the data structure |
|
1585 | d() # prewarm the data structure | |
1586 | timer(d, setup=setup) |
|
1586 | timer(d, setup=setup) | |
1587 | fm.end() |
|
1587 | fm.end() | |
1588 |
|
1588 | |||
1589 |
|
1589 | |||
1590 | @command(b'perfstartup', formatteropts) |
|
1590 | @command(b'perfstartup', formatteropts) | |
1591 | def perfstartup(ui, repo, **opts): |
|
1591 | def perfstartup(ui, repo, **opts): | |
1592 | opts = _byteskwargs(opts) |
|
1592 | opts = _byteskwargs(opts) | |
1593 | timer, fm = gettimer(ui, opts) |
|
1593 | timer, fm = gettimer(ui, opts) | |
1594 |
|
1594 | |||
1595 | def d(): |
|
1595 | def d(): | |
1596 | if os.name != r'nt': |
|
1596 | if os.name != r'nt': | |
1597 | os.system( |
|
1597 | os.system( | |
1598 | b"HGRCPATH= %s version -q > /dev/null" % fsencode(sys.argv[0]) |
|
1598 | b"HGRCPATH= %s version -q > /dev/null" % fsencode(sys.argv[0]) | |
1599 | ) |
|
1599 | ) | |
1600 | else: |
|
1600 | else: | |
1601 | os.environ[r'HGRCPATH'] = r' ' |
|
1601 | os.environ[r'HGRCPATH'] = r' ' | |
1602 | os.system(r"%s version -q > NUL" % sys.argv[0]) |
|
1602 | os.system(r"%s version -q > NUL" % sys.argv[0]) | |
1603 |
|
1603 | |||
1604 | timer(d) |
|
1604 | timer(d) | |
1605 | fm.end() |
|
1605 | fm.end() | |
1606 |
|
1606 | |||
1607 |
|
1607 | |||
1608 | @command(b'perfparents', formatteropts) |
|
1608 | @command(b'perfparents', formatteropts) | |
1609 | def perfparents(ui, repo, **opts): |
|
1609 | def perfparents(ui, repo, **opts): | |
1610 | """benchmark the time necessary to fetch one changeset's parents. |
|
1610 | """benchmark the time necessary to fetch one changeset's parents. | |
1611 |
|
1611 | |||
1612 | The fetch is done using the `node identifier`, traversing all object layers |
|
1612 | The fetch is done using the `node identifier`, traversing all object layers | |
1613 | from the repository object. The first N revisions will be used for this |
|
1613 | from the repository object. The first N revisions will be used for this | |
1614 | benchmark. N is controlled by the ``perf.parentscount`` config option |
|
1614 | benchmark. N is controlled by the ``perf.parentscount`` config option | |
1615 | (default: 1000). |
|
1615 | (default: 1000). | |
1616 | """ |
|
1616 | """ | |
1617 | opts = _byteskwargs(opts) |
|
1617 | opts = _byteskwargs(opts) | |
1618 | timer, fm = gettimer(ui, opts) |
|
1618 | timer, fm = gettimer(ui, opts) | |
1619 | # control the number of commits perfparents iterates over |
|
1619 | # control the number of commits perfparents iterates over | |
1620 | # experimental config: perf.parentscount |
|
1620 | # experimental config: perf.parentscount | |
1621 | count = getint(ui, b"perf", b"parentscount", 1000) |
|
1621 | count = getint(ui, b"perf", b"parentscount", 1000) | |
1622 | if len(repo.changelog) < count: |
|
1622 | if len(repo.changelog) < count: | |
1623 | raise error.Abort(b"repo needs %d commits for this test" % count) |
|
1623 | raise error.Abort(b"repo needs %d commits for this test" % count) | |
1624 | repo = repo.unfiltered() |
|
1624 | repo = repo.unfiltered() | |
1625 | nl = [repo.changelog.node(i) for i in _xrange(count)] |
|
1625 | nl = [repo.changelog.node(i) for i in _xrange(count)] | |
1626 |
|
1626 | |||
1627 | def d(): |
|
1627 | def d(): | |
1628 | for n in nl: |
|
1628 | for n in nl: | |
1629 | repo.changelog.parents(n) |
|
1629 | repo.changelog.parents(n) | |
1630 |
|
1630 | |||
1631 | timer(d) |
|
1631 | timer(d) | |
1632 | fm.end() |
|
1632 | fm.end() | |
1633 |
|
1633 | |||
1634 |
|
1634 | |||
1635 | @command(b'perfctxfiles', formatteropts) |
|
1635 | @command(b'perfctxfiles', formatteropts) | |
1636 | def perfctxfiles(ui, repo, x, **opts): |
|
1636 | def perfctxfiles(ui, repo, x, **opts): | |
1637 | opts = _byteskwargs(opts) |
|
1637 | opts = _byteskwargs(opts) | |
1638 | x = int(x) |
|
1638 | x = int(x) | |
1639 | timer, fm = gettimer(ui, opts) |
|
1639 | timer, fm = gettimer(ui, opts) | |
1640 |
|
1640 | |||
1641 | def d(): |
|
1641 | def d(): | |
1642 | len(repo[x].files()) |
|
1642 | len(repo[x].files()) | |
1643 |
|
1643 | |||
1644 | timer(d) |
|
1644 | timer(d) | |
1645 | fm.end() |
|
1645 | fm.end() | |
1646 |
|
1646 | |||
1647 |
|
1647 | |||
1648 | @command(b'perfrawfiles', formatteropts) |
|
1648 | @command(b'perfrawfiles', formatteropts) | |
1649 | def perfrawfiles(ui, repo, x, **opts): |
|
1649 | def perfrawfiles(ui, repo, x, **opts): | |
1650 | opts = _byteskwargs(opts) |
|
1650 | opts = _byteskwargs(opts) | |
1651 | x = int(x) |
|
1651 | x = int(x) | |
1652 | timer, fm = gettimer(ui, opts) |
|
1652 | timer, fm = gettimer(ui, opts) | |
1653 | cl = repo.changelog |
|
1653 | cl = repo.changelog | |
1654 |
|
1654 | |||
1655 | def d(): |
|
1655 | def d(): | |
1656 | len(cl.read(x)[3]) |
|
1656 | len(cl.read(x)[3]) | |
1657 |
|
1657 | |||
1658 | timer(d) |
|
1658 | timer(d) | |
1659 | fm.end() |
|
1659 | fm.end() | |
1660 |
|
1660 | |||
1661 |
|
1661 | |||
1662 | @command(b'perflookup', formatteropts) |
|
1662 | @command(b'perflookup', formatteropts) | |
1663 | def perflookup(ui, repo, rev, **opts): |
|
1663 | def perflookup(ui, repo, rev, **opts): | |
1664 | opts = _byteskwargs(opts) |
|
1664 | opts = _byteskwargs(opts) | |
1665 | timer, fm = gettimer(ui, opts) |
|
1665 | timer, fm = gettimer(ui, opts) | |
1666 | timer(lambda: len(repo.lookup(rev))) |
|
1666 | timer(lambda: len(repo.lookup(rev))) | |
1667 | fm.end() |
|
1667 | fm.end() | |
1668 |
|
1668 | |||
1669 |
|
1669 | |||
1670 | @command( |
|
1670 | @command( | |
1671 | b'perflinelogedits', |
|
1671 | b'perflinelogedits', | |
1672 | [ |
|
1672 | [ | |
1673 | (b'n', b'edits', 10000, b'number of edits'), |
|
1673 | (b'n', b'edits', 10000, b'number of edits'), | |
1674 | (b'', b'max-hunk-lines', 10, b'max lines in a hunk'), |
|
1674 | (b'', b'max-hunk-lines', 10, b'max lines in a hunk'), | |
1675 | ], |
|
1675 | ], | |
1676 | norepo=True, |
|
1676 | norepo=True, | |
1677 | ) |
|
1677 | ) | |
1678 | def perflinelogedits(ui, **opts): |
|
1678 | def perflinelogedits(ui, **opts): | |
1679 | from mercurial import linelog |
|
1679 | from mercurial import linelog | |
1680 |
|
1680 | |||
1681 | opts = _byteskwargs(opts) |
|
1681 | opts = _byteskwargs(opts) | |
1682 |
|
1682 | |||
1683 | edits = opts[b'edits'] |
|
1683 | edits = opts[b'edits'] | |
1684 | maxhunklines = opts[b'max_hunk_lines'] |
|
1684 | maxhunklines = opts[b'max_hunk_lines'] | |
1685 |
|
1685 | |||
1686 | maxb1 = 100000 |
|
1686 | maxb1 = 100000 | |
1687 | random.seed(0) |
|
1687 | random.seed(0) | |
1688 | randint = random.randint |
|
1688 | randint = random.randint | |
1689 | currentlines = 0 |
|
1689 | currentlines = 0 | |
1690 | arglist = [] |
|
1690 | arglist = [] | |
1691 | for rev in _xrange(edits): |
|
1691 | for rev in _xrange(edits): | |
1692 | a1 = randint(0, currentlines) |
|
1692 | a1 = randint(0, currentlines) | |
1693 | a2 = randint(a1, min(currentlines, a1 + maxhunklines)) |
|
1693 | a2 = randint(a1, min(currentlines, a1 + maxhunklines)) | |
1694 | b1 = randint(0, maxb1) |
|
1694 | b1 = randint(0, maxb1) | |
1695 | b2 = randint(b1, b1 + maxhunklines) |
|
1695 | b2 = randint(b1, b1 + maxhunklines) | |
1696 | currentlines += (b2 - b1) - (a2 - a1) |
|
1696 | currentlines += (b2 - b1) - (a2 - a1) | |
1697 | arglist.append((rev, a1, a2, b1, b2)) |
|
1697 | arglist.append((rev, a1, a2, b1, b2)) | |
1698 |
|
1698 | |||
1699 | def d(): |
|
1699 | def d(): | |
1700 | ll = linelog.linelog() |
|
1700 | ll = linelog.linelog() | |
1701 | for args in arglist: |
|
1701 | for args in arglist: | |
1702 | ll.replacelines(*args) |
|
1702 | ll.replacelines(*args) | |
1703 |
|
1703 | |||
1704 | timer, fm = gettimer(ui, opts) |
|
1704 | timer, fm = gettimer(ui, opts) | |
1705 | timer(d) |
|
1705 | timer(d) | |
1706 | fm.end() |
|
1706 | fm.end() | |
1707 |
|
1707 | |||
1708 |
|
1708 | |||
1709 | @command(b'perfrevrange', formatteropts) |
|
1709 | @command(b'perfrevrange', formatteropts) | |
1710 | def perfrevrange(ui, repo, *specs, **opts): |
|
1710 | def perfrevrange(ui, repo, *specs, **opts): | |
1711 | opts = _byteskwargs(opts) |
|
1711 | opts = _byteskwargs(opts) | |
1712 | timer, fm = gettimer(ui, opts) |
|
1712 | timer, fm = gettimer(ui, opts) | |
1713 | revrange = scmutil.revrange |
|
1713 | revrange = scmutil.revrange | |
1714 | timer(lambda: len(revrange(repo, specs))) |
|
1714 | timer(lambda: len(revrange(repo, specs))) | |
1715 | fm.end() |
|
1715 | fm.end() | |
1716 |
|
1716 | |||
1717 |
|
1717 | |||
1718 | @command(b'perfnodelookup', formatteropts) |
|
1718 | @command(b'perfnodelookup', formatteropts) | |
1719 | def perfnodelookup(ui, repo, rev, **opts): |
|
1719 | def perfnodelookup(ui, repo, rev, **opts): | |
1720 | opts = _byteskwargs(opts) |
|
1720 | opts = _byteskwargs(opts) | |
1721 | timer, fm = gettimer(ui, opts) |
|
1721 | timer, fm = gettimer(ui, opts) | |
1722 | import mercurial.revlog |
|
1722 | import mercurial.revlog | |
1723 |
|
1723 | |||
1724 | mercurial.revlog._prereadsize = 2 ** 24 # disable lazy parser in old hg |
|
1724 | mercurial.revlog._prereadsize = 2 ** 24 # disable lazy parser in old hg | |
1725 | n = scmutil.revsingle(repo, rev).node() |
|
1725 | n = scmutil.revsingle(repo, rev).node() | |
1726 | cl = mercurial.revlog.revlog(getsvfs(repo), b"00changelog.i") |
|
1726 | cl = mercurial.revlog.revlog(getsvfs(repo), b"00changelog.i") | |
1727 |
|
1727 | |||
1728 | def d(): |
|
1728 | def d(): | |
1729 | cl.rev(n) |
|
1729 | cl.rev(n) | |
1730 | clearcaches(cl) |
|
1730 | clearcaches(cl) | |
1731 |
|
1731 | |||
1732 | timer(d) |
|
1732 | timer(d) | |
1733 | fm.end() |
|
1733 | fm.end() | |
1734 |
|
1734 | |||
1735 |
|
1735 | |||
1736 | @command( |
|
1736 | @command( | |
1737 | b'perflog', |
|
1737 | b'perflog', | |
1738 | [(b'', b'rename', False, b'ask log to follow renames')] + formatteropts, |
|
1738 | [(b'', b'rename', False, b'ask log to follow renames')] + formatteropts, | |
1739 | ) |
|
1739 | ) | |
1740 | def perflog(ui, repo, rev=None, **opts): |
|
1740 | def perflog(ui, repo, rev=None, **opts): | |
1741 | opts = _byteskwargs(opts) |
|
1741 | opts = _byteskwargs(opts) | |
1742 | if rev is None: |
|
1742 | if rev is None: | |
1743 | rev = [] |
|
1743 | rev = [] | |
1744 | timer, fm = gettimer(ui, opts) |
|
1744 | timer, fm = gettimer(ui, opts) | |
1745 | ui.pushbuffer() |
|
1745 | ui.pushbuffer() | |
1746 | timer( |
|
1746 | timer( | |
1747 | lambda: commands.log( |
|
1747 | lambda: commands.log( | |
1748 | ui, repo, rev=rev, date=b'', user=b'', copies=opts.get(b'rename') |
|
1748 | ui, repo, rev=rev, date=b'', user=b'', copies=opts.get(b'rename') | |
1749 | ) |
|
1749 | ) | |
1750 | ) |
|
1750 | ) | |
1751 | ui.popbuffer() |
|
1751 | ui.popbuffer() | |
1752 | fm.end() |
|
1752 | fm.end() | |
1753 |
|
1753 | |||
1754 |
|
1754 | |||
1755 | @command(b'perfmoonwalk', formatteropts) |
|
1755 | @command(b'perfmoonwalk', formatteropts) | |
1756 | def perfmoonwalk(ui, repo, **opts): |
|
1756 | def perfmoonwalk(ui, repo, **opts): | |
1757 | """benchmark walking the changelog backwards |
|
1757 | """benchmark walking the changelog backwards | |
1758 |
|
1758 | |||
1759 | This also loads the changelog data for each revision in the changelog. |
|
1759 | This also loads the changelog data for each revision in the changelog. | |
1760 | """ |
|
1760 | """ | |
1761 | opts = _byteskwargs(opts) |
|
1761 | opts = _byteskwargs(opts) | |
1762 | timer, fm = gettimer(ui, opts) |
|
1762 | timer, fm = gettimer(ui, opts) | |
1763 |
|
1763 | |||
1764 | def moonwalk(): |
|
1764 | def moonwalk(): | |
1765 | for i in repo.changelog.revs(start=(len(repo) - 1), stop=-1): |
|
1765 | for i in repo.changelog.revs(start=(len(repo) - 1), stop=-1): | |
1766 | ctx = repo[i] |
|
1766 | ctx = repo[i] | |
1767 | ctx.branch() # read changelog data (in addition to the index) |
|
1767 | ctx.branch() # read changelog data (in addition to the index) | |
1768 |
|
1768 | |||
1769 | timer(moonwalk) |
|
1769 | timer(moonwalk) | |
1770 | fm.end() |
|
1770 | fm.end() | |
1771 |
|
1771 | |||
1772 |
|
1772 | |||
1773 | @command( |
|
1773 | @command( | |
1774 | b'perftemplating', |
|
1774 | b'perftemplating', | |
1775 | [(b'r', b'rev', [], b'revisions to run the template on'),] + formatteropts, |
|
1775 | [(b'r', b'rev', [], b'revisions to run the template on'),] + formatteropts, | |
1776 | ) |
|
1776 | ) | |
1777 | def perftemplating(ui, repo, testedtemplate=None, **opts): |
|
1777 | def perftemplating(ui, repo, testedtemplate=None, **opts): | |
1778 | """test the rendering time of a given template""" |
|
1778 | """test the rendering time of a given template""" | |
1779 | if makelogtemplater is None: |
|
1779 | if makelogtemplater is None: | |
1780 | raise error.Abort( |
|
1780 | raise error.Abort( | |
1781 | b"perftemplating not available with this Mercurial", |
|
1781 | b"perftemplating not available with this Mercurial", | |
1782 | hint=b"use 4.3 or later", |
|
1782 | hint=b"use 4.3 or later", | |
1783 | ) |
|
1783 | ) | |
1784 |
|
1784 | |||
1785 | opts = _byteskwargs(opts) |
|
1785 | opts = _byteskwargs(opts) | |
1786 |
|
1786 | |||
1787 | nullui = ui.copy() |
|
1787 | nullui = ui.copy() | |
1788 | nullui.fout = open(os.devnull, r'wb') |
|
1788 | nullui.fout = open(os.devnull, r'wb') | |
1789 | nullui.disablepager() |
|
1789 | nullui.disablepager() | |
1790 | revs = opts.get(b'rev') |
|
1790 | revs = opts.get(b'rev') | |
1791 | if not revs: |
|
1791 | if not revs: | |
1792 | revs = [b'all()'] |
|
1792 | revs = [b'all()'] | |
1793 | revs = list(scmutil.revrange(repo, revs)) |
|
1793 | revs = list(scmutil.revrange(repo, revs)) | |
1794 |
|
1794 | |||
1795 | defaulttemplate = ( |
|
1795 | defaulttemplate = ( | |
1796 | b'{date|shortdate} [{rev}:{node|short}]' |
|
1796 | b'{date|shortdate} [{rev}:{node|short}]' | |
1797 | b' {author|person}: {desc|firstline}\n' |
|
1797 | b' {author|person}: {desc|firstline}\n' | |
1798 | ) |
|
1798 | ) | |
1799 | if testedtemplate is None: |
|
1799 | if testedtemplate is None: | |
1800 | testedtemplate = defaulttemplate |
|
1800 | testedtemplate = defaulttemplate | |
1801 | displayer = makelogtemplater(nullui, repo, testedtemplate) |
|
1801 | displayer = makelogtemplater(nullui, repo, testedtemplate) | |
1802 |
|
1802 | |||
1803 | def format(): |
|
1803 | def format(): | |
1804 | for r in revs: |
|
1804 | for r in revs: | |
1805 | ctx = repo[r] |
|
1805 | ctx = repo[r] | |
1806 | displayer.show(ctx) |
|
1806 | displayer.show(ctx) | |
1807 | displayer.flush(ctx) |
|
1807 | displayer.flush(ctx) | |
1808 |
|
1808 | |||
1809 | timer, fm = gettimer(ui, opts) |
|
1809 | timer, fm = gettimer(ui, opts) | |
1810 | timer(format) |
|
1810 | timer(format) | |
1811 | fm.end() |
|
1811 | fm.end() | |
1812 |
|
1812 | |||
1813 |
|
1813 | |||
1814 | def _displaystats(ui, opts, entries, data): |
|
1814 | def _displaystats(ui, opts, entries, data): | |
1815 | pass |
|
1815 | pass | |
1816 | # use a second formatter because the data are quite different, not sure |
|
1816 | # use a second formatter because the data are quite different, not sure | |
1817 | # how it flies with the templater. |
|
1817 | # how it flies with the templater. | |
1818 | fm = ui.formatter(b'perf-stats', opts) |
|
1818 | fm = ui.formatter(b'perf-stats', opts) | |
1819 | for key, title in entries: |
|
1819 | for key, title in entries: | |
1820 | values = data[key] |
|
1820 | values = data[key] | |
1821 | nbvalues = len(data) |
|
1821 | nbvalues = len(data) | |
1822 | values.sort() |
|
1822 | values.sort() | |
1823 | stats = { |
|
1823 | stats = { | |
1824 | 'key': key, |
|
1824 | 'key': key, | |
1825 | 'title': title, |
|
1825 | 'title': title, | |
1826 | 'nbitems': len(values), |
|
1826 | 'nbitems': len(values), | |
1827 | 'min': values[0][0], |
|
1827 | 'min': values[0][0], | |
1828 | '10%': values[(nbvalues * 10) // 100][0], |
|
1828 | '10%': values[(nbvalues * 10) // 100][0], | |
1829 | '25%': values[(nbvalues * 25) // 100][0], |
|
1829 | '25%': values[(nbvalues * 25) // 100][0], | |
1830 | '50%': values[(nbvalues * 50) // 100][0], |
|
1830 | '50%': values[(nbvalues * 50) // 100][0], | |
1831 | '75%': values[(nbvalues * 75) // 100][0], |
|
1831 | '75%': values[(nbvalues * 75) // 100][0], | |
1832 | '80%': values[(nbvalues * 80) // 100][0], |
|
1832 | '80%': values[(nbvalues * 80) // 100][0], | |
1833 | '85%': values[(nbvalues * 85) // 100][0], |
|
1833 | '85%': values[(nbvalues * 85) // 100][0], | |
1834 | '90%': values[(nbvalues * 90) // 100][0], |
|
1834 | '90%': values[(nbvalues * 90) // 100][0], | |
1835 | '95%': values[(nbvalues * 95) // 100][0], |
|
1835 | '95%': values[(nbvalues * 95) // 100][0], | |
1836 | '99%': values[(nbvalues * 99) // 100][0], |
|
1836 | '99%': values[(nbvalues * 99) // 100][0], | |
1837 | 'max': values[-1][0], |
|
1837 | 'max': values[-1][0], | |
1838 | } |
|
1838 | } | |
1839 | fm.startitem() |
|
1839 | fm.startitem() | |
1840 | fm.data(**stats) |
|
1840 | fm.data(**stats) | |
1841 | # make node pretty for the human output |
|
1841 | # make node pretty for the human output | |
1842 | fm.plain('### %s (%d items)\n' % (title, len(values))) |
|
1842 | fm.plain('### %s (%d items)\n' % (title, len(values))) | |
1843 | lines = [ |
|
1843 | lines = [ | |
1844 | 'min', |
|
1844 | 'min', | |
1845 | '10%', |
|
1845 | '10%', | |
1846 | '25%', |
|
1846 | '25%', | |
1847 | '50%', |
|
1847 | '50%', | |
1848 | '75%', |
|
1848 | '75%', | |
1849 | '80%', |
|
1849 | '80%', | |
1850 | '85%', |
|
1850 | '85%', | |
1851 | '90%', |
|
1851 | '90%', | |
1852 | '95%', |
|
1852 | '95%', | |
1853 | '99%', |
|
1853 | '99%', | |
1854 | 'max', |
|
1854 | 'max', | |
1855 | ] |
|
1855 | ] | |
1856 | for l in lines: |
|
1856 | for l in lines: | |
1857 | fm.plain('%s: %s\n' % (l, stats[l])) |
|
1857 | fm.plain('%s: %s\n' % (l, stats[l])) | |
1858 | fm.end() |
|
1858 | fm.end() | |
1859 |
|
1859 | |||
1860 |
|
1860 | |||
1861 | @command( |
|
1861 | @command( | |
1862 | b'perfhelper-mergecopies', |
|
1862 | b'perfhelper-mergecopies', | |
1863 | formatteropts |
|
1863 | formatteropts | |
1864 | + [ |
|
1864 | + [ | |
1865 | (b'r', b'revs', [], b'restrict search to these revisions'), |
|
1865 | (b'r', b'revs', [], b'restrict search to these revisions'), | |
1866 | (b'', b'timing', False, b'provides extra data (costly)'), |
|
1866 | (b'', b'timing', False, b'provides extra data (costly)'), | |
1867 | (b'', b'stats', False, b'provides statistic about the measured data'), |
|
1867 | (b'', b'stats', False, b'provides statistic about the measured data'), | |
1868 | ], |
|
1868 | ], | |
1869 | ) |
|
1869 | ) | |
1870 | def perfhelpermergecopies(ui, repo, revs=[], **opts): |
|
1870 | def perfhelpermergecopies(ui, repo, revs=[], **opts): | |
1871 | """find statistics about potential parameters for `perfmergecopies` |
|
1871 | """find statistics about potential parameters for `perfmergecopies` | |
1872 |
|
1872 | |||
1873 | This command find (base, p1, p2) triplet relevant for copytracing |
|
1873 | This command find (base, p1, p2) triplet relevant for copytracing | |
1874 | benchmarking in the context of a merge. It reports values for some of the |
|
1874 | benchmarking in the context of a merge. It reports values for some of the | |
1875 | parameters that impact merge copy tracing time during merge. |
|
1875 | parameters that impact merge copy tracing time during merge. | |
1876 |
|
1876 | |||
1877 | If `--timing` is set, rename detection is run and the associated timing |
|
1877 | If `--timing` is set, rename detection is run and the associated timing | |
1878 | will be reported. The extra details come at the cost of slower command |
|
1878 | will be reported. The extra details come at the cost of slower command | |
1879 | execution. |
|
1879 | execution. | |
1880 |
|
1880 | |||
1881 | Since rename detection is only run once, other factors might easily |
|
1881 | Since rename detection is only run once, other factors might easily | |
1882 | affect the precision of the timing. However it should give a good |
|
1882 | affect the precision of the timing. However it should give a good | |
1883 | approximation of which revision triplets are very costly. |
|
1883 | approximation of which revision triplets are very costly. | |
1884 | """ |
|
1884 | """ | |
1885 | opts = _byteskwargs(opts) |
|
1885 | opts = _byteskwargs(opts) | |
1886 | fm = ui.formatter(b'perf', opts) |
|
1886 | fm = ui.formatter(b'perf', opts) | |
1887 | dotiming = opts[b'timing'] |
|
1887 | dotiming = opts[b'timing'] | |
1888 | dostats = opts[b'stats'] |
|
1888 | dostats = opts[b'stats'] | |
1889 |
|
1889 | |||
1890 | output_template = [ |
|
1890 | output_template = [ | |
1891 | ("base", "%(base)12s"), |
|
1891 | ("base", "%(base)12s"), | |
1892 | ("p1", "%(p1.node)12s"), |
|
1892 | ("p1", "%(p1.node)12s"), | |
1893 | ("p2", "%(p2.node)12s"), |
|
1893 | ("p2", "%(p2.node)12s"), | |
1894 | ("p1.nb-revs", "%(p1.nbrevs)12d"), |
|
1894 | ("p1.nb-revs", "%(p1.nbrevs)12d"), | |
1895 | ("p1.nb-files", "%(p1.nbmissingfiles)12d"), |
|
1895 | ("p1.nb-files", "%(p1.nbmissingfiles)12d"), | |
1896 | ("p1.renames", "%(p1.renamedfiles)12d"), |
|
1896 | ("p1.renames", "%(p1.renamedfiles)12d"), | |
1897 | ("p1.time", "%(p1.time)12.3f"), |
|
1897 | ("p1.time", "%(p1.time)12.3f"), | |
1898 | ("p2.nb-revs", "%(p2.nbrevs)12d"), |
|
1898 | ("p2.nb-revs", "%(p2.nbrevs)12d"), | |
1899 | ("p2.nb-files", "%(p2.nbmissingfiles)12d"), |
|
1899 | ("p2.nb-files", "%(p2.nbmissingfiles)12d"), | |
1900 | ("p2.renames", "%(p2.renamedfiles)12d"), |
|
1900 | ("p2.renames", "%(p2.renamedfiles)12d"), | |
1901 | ("p2.time", "%(p2.time)12.3f"), |
|
1901 | ("p2.time", "%(p2.time)12.3f"), | |
1902 | ("renames", "%(nbrenamedfiles)12d"), |
|
1902 | ("renames", "%(nbrenamedfiles)12d"), | |
1903 | ("total.time", "%(time)12.3f"), |
|
1903 | ("total.time", "%(time)12.3f"), | |
1904 | ] |
|
1904 | ] | |
1905 | if not dotiming: |
|
1905 | if not dotiming: | |
1906 | output_template = [ |
|
1906 | output_template = [ | |
1907 | i |
|
1907 | i | |
1908 | for i in output_template |
|
1908 | for i in output_template | |
1909 | if not ('time' in i[0] or 'renames' in i[0]) |
|
1909 | if not ('time' in i[0] or 'renames' in i[0]) | |
1910 | ] |
|
1910 | ] | |
1911 | header_names = [h for (h, v) in output_template] |
|
1911 | header_names = [h for (h, v) in output_template] | |
1912 | output = ' '.join([v for (h, v) in output_template]) + '\n' |
|
1912 | output = ' '.join([v for (h, v) in output_template]) + '\n' | |
1913 | header = ' '.join(['%12s'] * len(header_names)) + '\n' |
|
1913 | header = ' '.join(['%12s'] * len(header_names)) + '\n' | |
1914 | fm.plain(header % tuple(header_names)) |
|
1914 | fm.plain(header % tuple(header_names)) | |
1915 |
|
1915 | |||
1916 | if not revs: |
|
1916 | if not revs: | |
1917 | revs = ['all()'] |
|
1917 | revs = ['all()'] | |
1918 | revs = scmutil.revrange(repo, revs) |
|
1918 | revs = scmutil.revrange(repo, revs) | |
1919 |
|
1919 | |||
1920 | if dostats: |
|
1920 | if dostats: | |
1921 | alldata = { |
|
1921 | alldata = { | |
1922 | 'nbrevs': [], |
|
1922 | 'nbrevs': [], | |
1923 | 'nbmissingfiles': [], |
|
1923 | 'nbmissingfiles': [], | |
1924 | } |
|
1924 | } | |
1925 | if dotiming: |
|
1925 | if dotiming: | |
1926 | alldata['parentnbrenames'] = [] |
|
1926 | alldata['parentnbrenames'] = [] | |
1927 | alldata['totalnbrenames'] = [] |
|
1927 | alldata['totalnbrenames'] = [] | |
1928 | alldata['parenttime'] = [] |
|
1928 | alldata['parenttime'] = [] | |
1929 | alldata['totaltime'] = [] |
|
1929 | alldata['totaltime'] = [] | |
1930 |
|
1930 | |||
1931 | roi = repo.revs('merge() and %ld', revs) |
|
1931 | roi = repo.revs('merge() and %ld', revs) | |
1932 | for r in roi: |
|
1932 | for r in roi: | |
1933 | ctx = repo[r] |
|
1933 | ctx = repo[r] | |
1934 | p1 = ctx.p1() |
|
1934 | p1 = ctx.p1() | |
1935 | p2 = ctx.p2() |
|
1935 | p2 = ctx.p2() | |
1936 | bases = repo.changelog._commonancestorsheads(p1.rev(), p2.rev()) |
|
1936 | bases = repo.changelog._commonancestorsheads(p1.rev(), p2.rev()) | |
1937 | for b in bases: |
|
1937 | for b in bases: | |
1938 | b = repo[b] |
|
1938 | b = repo[b] | |
1939 | p1missing = copies._computeforwardmissing(b, p1) |
|
1939 | p1missing = copies._computeforwardmissing(b, p1) | |
1940 | p2missing = copies._computeforwardmissing(b, p2) |
|
1940 | p2missing = copies._computeforwardmissing(b, p2) | |
1941 | data = { |
|
1941 | data = { | |
1942 | b'base': b.hex(), |
|
1942 | b'base': b.hex(), | |
1943 | b'p1.node': p1.hex(), |
|
1943 | b'p1.node': p1.hex(), | |
1944 |
b'p1.nbrevs': len(repo.revs('%d |
|
1944 | b'p1.nbrevs': len(repo.revs('only(%d, %d)', p1.rev(), b.rev())), | |
1945 | b'p1.nbmissingfiles': len(p1missing), |
|
1945 | b'p1.nbmissingfiles': len(p1missing), | |
1946 | b'p2.node': p2.hex(), |
|
1946 | b'p2.node': p2.hex(), | |
1947 |
b'p2.nbrevs': len(repo.revs('%d |
|
1947 | b'p2.nbrevs': len(repo.revs('only(%d, %d)', p2.rev(), b.rev())), | |
1948 | b'p2.nbmissingfiles': len(p2missing), |
|
1948 | b'p2.nbmissingfiles': len(p2missing), | |
1949 | } |
|
1949 | } | |
1950 | if dostats: |
|
1950 | if dostats: | |
1951 | if p1missing: |
|
1951 | if p1missing: | |
1952 | alldata['nbrevs'].append( |
|
1952 | alldata['nbrevs'].append( | |
1953 | (data['p1.nbrevs'], b.hex(), p1.hex()) |
|
1953 | (data['p1.nbrevs'], b.hex(), p1.hex()) | |
1954 | ) |
|
1954 | ) | |
1955 | alldata['nbmissingfiles'].append( |
|
1955 | alldata['nbmissingfiles'].append( | |
1956 | (data['p1.nbmissingfiles'], b.hex(), p1.hex()) |
|
1956 | (data['p1.nbmissingfiles'], b.hex(), p1.hex()) | |
1957 | ) |
|
1957 | ) | |
1958 | if p2missing: |
|
1958 | if p2missing: | |
1959 | alldata['nbrevs'].append( |
|
1959 | alldata['nbrevs'].append( | |
1960 | (data['p2.nbrevs'], b.hex(), p2.hex()) |
|
1960 | (data['p2.nbrevs'], b.hex(), p2.hex()) | |
1961 | ) |
|
1961 | ) | |
1962 | alldata['nbmissingfiles'].append( |
|
1962 | alldata['nbmissingfiles'].append( | |
1963 | (data['p2.nbmissingfiles'], b.hex(), p2.hex()) |
|
1963 | (data['p2.nbmissingfiles'], b.hex(), p2.hex()) | |
1964 | ) |
|
1964 | ) | |
1965 | if dotiming: |
|
1965 | if dotiming: | |
1966 | begin = util.timer() |
|
1966 | begin = util.timer() | |
1967 | mergedata = copies.mergecopies(repo, p1, p2, b) |
|
1967 | mergedata = copies.mergecopies(repo, p1, p2, b) | |
1968 | end = util.timer() |
|
1968 | end = util.timer() | |
1969 | # not very stable timing since we did only one run |
|
1969 | # not very stable timing since we did only one run | |
1970 | data['time'] = end - begin |
|
1970 | data['time'] = end - begin | |
1971 | # mergedata contains five dicts: "copy", "movewithdir", |
|
1971 | # mergedata contains five dicts: "copy", "movewithdir", | |
1972 | # "diverge", "renamedelete" and "dirmove". |
|
1972 | # "diverge", "renamedelete" and "dirmove". | |
1973 | # The first 4 are about renamed file so lets count that. |
|
1973 | # The first 4 are about renamed file so lets count that. | |
1974 | renames = len(mergedata[0]) |
|
1974 | renames = len(mergedata[0]) | |
1975 | renames += len(mergedata[1]) |
|
1975 | renames += len(mergedata[1]) | |
1976 | renames += len(mergedata[2]) |
|
1976 | renames += len(mergedata[2]) | |
1977 | renames += len(mergedata[3]) |
|
1977 | renames += len(mergedata[3]) | |
1978 | data['nbrenamedfiles'] = renames |
|
1978 | data['nbrenamedfiles'] = renames | |
1979 | begin = util.timer() |
|
1979 | begin = util.timer() | |
1980 | p1renames = copies.pathcopies(b, p1) |
|
1980 | p1renames = copies.pathcopies(b, p1) | |
1981 | end = util.timer() |
|
1981 | end = util.timer() | |
1982 | data['p1.time'] = end - begin |
|
1982 | data['p1.time'] = end - begin | |
1983 | begin = util.timer() |
|
1983 | begin = util.timer() | |
1984 | p2renames = copies.pathcopies(b, p2) |
|
1984 | p2renames = copies.pathcopies(b, p2) | |
1985 | data['p2.time'] = end - begin |
|
1985 | data['p2.time'] = end - begin | |
1986 | end = util.timer() |
|
1986 | end = util.timer() | |
1987 | data['p1.renamedfiles'] = len(p1renames) |
|
1987 | data['p1.renamedfiles'] = len(p1renames) | |
1988 | data['p2.renamedfiles'] = len(p2renames) |
|
1988 | data['p2.renamedfiles'] = len(p2renames) | |
1989 |
|
1989 | |||
1990 | if dostats: |
|
1990 | if dostats: | |
1991 | if p1missing: |
|
1991 | if p1missing: | |
1992 | alldata['parentnbrenames'].append( |
|
1992 | alldata['parentnbrenames'].append( | |
1993 | (data['p1.renamedfiles'], b.hex(), p1.hex()) |
|
1993 | (data['p1.renamedfiles'], b.hex(), p1.hex()) | |
1994 | ) |
|
1994 | ) | |
1995 | alldata['parenttime'].append( |
|
1995 | alldata['parenttime'].append( | |
1996 | (data['p1.time'], b.hex(), p1.hex()) |
|
1996 | (data['p1.time'], b.hex(), p1.hex()) | |
1997 | ) |
|
1997 | ) | |
1998 | if p2missing: |
|
1998 | if p2missing: | |
1999 | alldata['parentnbrenames'].append( |
|
1999 | alldata['parentnbrenames'].append( | |
2000 | (data['p2.renamedfiles'], b.hex(), p2.hex()) |
|
2000 | (data['p2.renamedfiles'], b.hex(), p2.hex()) | |
2001 | ) |
|
2001 | ) | |
2002 | alldata['parenttime'].append( |
|
2002 | alldata['parenttime'].append( | |
2003 | (data['p2.time'], b.hex(), p2.hex()) |
|
2003 | (data['p2.time'], b.hex(), p2.hex()) | |
2004 | ) |
|
2004 | ) | |
2005 | if p1missing or p2missing: |
|
2005 | if p1missing or p2missing: | |
2006 | alldata['totalnbrenames'].append( |
|
2006 | alldata['totalnbrenames'].append( | |
2007 | ( |
|
2007 | ( | |
2008 | data['nbrenamedfiles'], |
|
2008 | data['nbrenamedfiles'], | |
2009 | b.hex(), |
|
2009 | b.hex(), | |
2010 | p1.hex(), |
|
2010 | p1.hex(), | |
2011 | p2.hex(), |
|
2011 | p2.hex(), | |
2012 | ) |
|
2012 | ) | |
2013 | ) |
|
2013 | ) | |
2014 | alldata['totaltime'].append( |
|
2014 | alldata['totaltime'].append( | |
2015 | (data['time'], b.hex(), p1.hex(), p2.hex()) |
|
2015 | (data['time'], b.hex(), p1.hex(), p2.hex()) | |
2016 | ) |
|
2016 | ) | |
2017 | fm.startitem() |
|
2017 | fm.startitem() | |
2018 | fm.data(**data) |
|
2018 | fm.data(**data) | |
2019 | # make node pretty for the human output |
|
2019 | # make node pretty for the human output | |
2020 | out = data.copy() |
|
2020 | out = data.copy() | |
2021 | out['base'] = fm.hexfunc(b.node()) |
|
2021 | out['base'] = fm.hexfunc(b.node()) | |
2022 | out['p1.node'] = fm.hexfunc(p1.node()) |
|
2022 | out['p1.node'] = fm.hexfunc(p1.node()) | |
2023 | out['p2.node'] = fm.hexfunc(p2.node()) |
|
2023 | out['p2.node'] = fm.hexfunc(p2.node()) | |
2024 | fm.plain(output % out) |
|
2024 | fm.plain(output % out) | |
2025 |
|
2025 | |||
2026 | fm.end() |
|
2026 | fm.end() | |
2027 | if dostats: |
|
2027 | if dostats: | |
2028 | # use a second formatter because the data are quite different, not sure |
|
2028 | # use a second formatter because the data are quite different, not sure | |
2029 | # how it flies with the templater. |
|
2029 | # how it flies with the templater. | |
2030 | entries = [ |
|
2030 | entries = [ | |
2031 | ('nbrevs', 'number of revision covered'), |
|
2031 | ('nbrevs', 'number of revision covered'), | |
2032 | ('nbmissingfiles', 'number of missing files at head'), |
|
2032 | ('nbmissingfiles', 'number of missing files at head'), | |
2033 | ] |
|
2033 | ] | |
2034 | if dotiming: |
|
2034 | if dotiming: | |
2035 | entries.append( |
|
2035 | entries.append( | |
2036 | ('parentnbrenames', 'rename from one parent to base') |
|
2036 | ('parentnbrenames', 'rename from one parent to base') | |
2037 | ) |
|
2037 | ) | |
2038 | entries.append(('totalnbrenames', 'total number of renames')) |
|
2038 | entries.append(('totalnbrenames', 'total number of renames')) | |
2039 | entries.append(('parenttime', 'time for one parent')) |
|
2039 | entries.append(('parenttime', 'time for one parent')) | |
2040 | entries.append(('totaltime', 'time for both parents')) |
|
2040 | entries.append(('totaltime', 'time for both parents')) | |
2041 | _displaystats(ui, opts, entries, alldata) |
|
2041 | _displaystats(ui, opts, entries, alldata) | |
2042 |
|
2042 | |||
2043 |
|
2043 | |||
2044 | @command( |
|
2044 | @command( | |
2045 | b'perfhelper-pathcopies', |
|
2045 | b'perfhelper-pathcopies', | |
2046 | formatteropts |
|
2046 | formatteropts | |
2047 | + [ |
|
2047 | + [ | |
2048 | (b'r', b'revs', [], b'restrict search to these revisions'), |
|
2048 | (b'r', b'revs', [], b'restrict search to these revisions'), | |
2049 | (b'', b'timing', False, b'provides extra data (costly)'), |
|
2049 | (b'', b'timing', False, b'provides extra data (costly)'), | |
2050 | (b'', b'stats', False, b'provides statistic about the measured data'), |
|
2050 | (b'', b'stats', False, b'provides statistic about the measured data'), | |
2051 | ], |
|
2051 | ], | |
2052 | ) |
|
2052 | ) | |
2053 | def perfhelperpathcopies(ui, repo, revs=[], **opts): |
|
2053 | def perfhelperpathcopies(ui, repo, revs=[], **opts): | |
2054 | """find statistic about potential parameters for the `perftracecopies` |
|
2054 | """find statistic about potential parameters for the `perftracecopies` | |
2055 |
|
2055 | |||
2056 | This command find source-destination pair relevant for copytracing testing. |
|
2056 | This command find source-destination pair relevant for copytracing testing. | |
2057 | It report value for some of the parameters that impact copy tracing time. |
|
2057 | It report value for some of the parameters that impact copy tracing time. | |
2058 |
|
2058 | |||
2059 | If `--timing` is set, rename detection is run and the associated timing |
|
2059 | If `--timing` is set, rename detection is run and the associated timing | |
2060 | will be reported. The extra details comes at the cost of a slower command |
|
2060 | will be reported. The extra details comes at the cost of a slower command | |
2061 | execution. |
|
2061 | execution. | |
2062 |
|
2062 | |||
2063 | Since the rename detection is only run once, other factors might easily |
|
2063 | Since the rename detection is only run once, other factors might easily | |
2064 | affect the precision of the timing. However it should give a good |
|
2064 | affect the precision of the timing. However it should give a good | |
2065 | approximation of which revision pairs are very costly. |
|
2065 | approximation of which revision pairs are very costly. | |
2066 | """ |
|
2066 | """ | |
2067 | opts = _byteskwargs(opts) |
|
2067 | opts = _byteskwargs(opts) | |
2068 | fm = ui.formatter(b'perf', opts) |
|
2068 | fm = ui.formatter(b'perf', opts) | |
2069 | dotiming = opts[b'timing'] |
|
2069 | dotiming = opts[b'timing'] | |
2070 | dostats = opts[b'stats'] |
|
2070 | dostats = opts[b'stats'] | |
2071 |
|
2071 | |||
2072 | if dotiming: |
|
2072 | if dotiming: | |
2073 | header = '%12s %12s %12s %12s %12s %12s\n' |
|
2073 | header = '%12s %12s %12s %12s %12s %12s\n' | |
2074 | output = ( |
|
2074 | output = ( | |
2075 | "%(source)12s %(destination)12s " |
|
2075 | "%(source)12s %(destination)12s " | |
2076 | "%(nbrevs)12d %(nbmissingfiles)12d " |
|
2076 | "%(nbrevs)12d %(nbmissingfiles)12d " | |
2077 | "%(nbrenamedfiles)12d %(time)18.5f\n" |
|
2077 | "%(nbrenamedfiles)12d %(time)18.5f\n" | |
2078 | ) |
|
2078 | ) | |
2079 | header_names = ( |
|
2079 | header_names = ( | |
2080 | "source", |
|
2080 | "source", | |
2081 | "destination", |
|
2081 | "destination", | |
2082 | "nb-revs", |
|
2082 | "nb-revs", | |
2083 | "nb-files", |
|
2083 | "nb-files", | |
2084 | "nb-renames", |
|
2084 | "nb-renames", | |
2085 | "time", |
|
2085 | "time", | |
2086 | ) |
|
2086 | ) | |
2087 | fm.plain(header % header_names) |
|
2087 | fm.plain(header % header_names) | |
2088 | else: |
|
2088 | else: | |
2089 | header = '%12s %12s %12s %12s\n' |
|
2089 | header = '%12s %12s %12s %12s\n' | |
2090 | output = ( |
|
2090 | output = ( | |
2091 | "%(source)12s %(destination)12s " |
|
2091 | "%(source)12s %(destination)12s " | |
2092 | "%(nbrevs)12d %(nbmissingfiles)12d\n" |
|
2092 | "%(nbrevs)12d %(nbmissingfiles)12d\n" | |
2093 | ) |
|
2093 | ) | |
2094 | fm.plain(header % ("source", "destination", "nb-revs", "nb-files")) |
|
2094 | fm.plain(header % ("source", "destination", "nb-revs", "nb-files")) | |
2095 |
|
2095 | |||
2096 | if not revs: |
|
2096 | if not revs: | |
2097 | revs = ['all()'] |
|
2097 | revs = ['all()'] | |
2098 | revs = scmutil.revrange(repo, revs) |
|
2098 | revs = scmutil.revrange(repo, revs) | |
2099 |
|
2099 | |||
2100 | if dostats: |
|
2100 | if dostats: | |
2101 | alldata = { |
|
2101 | alldata = { | |
2102 | 'nbrevs': [], |
|
2102 | 'nbrevs': [], | |
2103 | 'nbmissingfiles': [], |
|
2103 | 'nbmissingfiles': [], | |
2104 | } |
|
2104 | } | |
2105 | if dotiming: |
|
2105 | if dotiming: | |
2106 | alldata['nbrenames'] = [] |
|
2106 | alldata['nbrenames'] = [] | |
2107 | alldata['time'] = [] |
|
2107 | alldata['time'] = [] | |
2108 |
|
2108 | |||
2109 | roi = repo.revs('merge() and %ld', revs) |
|
2109 | roi = repo.revs('merge() and %ld', revs) | |
2110 | for r in roi: |
|
2110 | for r in roi: | |
2111 | ctx = repo[r] |
|
2111 | ctx = repo[r] | |
2112 | p1 = ctx.p1().rev() |
|
2112 | p1 = ctx.p1().rev() | |
2113 | p2 = ctx.p2().rev() |
|
2113 | p2 = ctx.p2().rev() | |
2114 | bases = repo.changelog._commonancestorsheads(p1, p2) |
|
2114 | bases = repo.changelog._commonancestorsheads(p1, p2) | |
2115 | for p in (p1, p2): |
|
2115 | for p in (p1, p2): | |
2116 | for b in bases: |
|
2116 | for b in bases: | |
2117 | base = repo[b] |
|
2117 | base = repo[b] | |
2118 | parent = repo[p] |
|
2118 | parent = repo[p] | |
2119 | missing = copies._computeforwardmissing(base, parent) |
|
2119 | missing = copies._computeforwardmissing(base, parent) | |
2120 | if not missing: |
|
2120 | if not missing: | |
2121 | continue |
|
2121 | continue | |
2122 | data = { |
|
2122 | data = { | |
2123 | b'source': base.hex(), |
|
2123 | b'source': base.hex(), | |
2124 | b'destination': parent.hex(), |
|
2124 | b'destination': parent.hex(), | |
2125 | b'nbrevs': len(repo.revs('only(%d, %d)', p, b)), |
|
2125 | b'nbrevs': len(repo.revs('only(%d, %d)', p, b)), | |
2126 | b'nbmissingfiles': len(missing), |
|
2126 | b'nbmissingfiles': len(missing), | |
2127 | } |
|
2127 | } | |
2128 | if dostats: |
|
2128 | if dostats: | |
2129 | alldata['nbrevs'].append( |
|
2129 | alldata['nbrevs'].append( | |
2130 | (data['nbrevs'], base.hex(), parent.hex(),) |
|
2130 | (data['nbrevs'], base.hex(), parent.hex(),) | |
2131 | ) |
|
2131 | ) | |
2132 | alldata['nbmissingfiles'].append( |
|
2132 | alldata['nbmissingfiles'].append( | |
2133 | (data['nbmissingfiles'], base.hex(), parent.hex(),) |
|
2133 | (data['nbmissingfiles'], base.hex(), parent.hex(),) | |
2134 | ) |
|
2134 | ) | |
2135 | if dotiming: |
|
2135 | if dotiming: | |
2136 | begin = util.timer() |
|
2136 | begin = util.timer() | |
2137 | renames = copies.pathcopies(base, parent) |
|
2137 | renames = copies.pathcopies(base, parent) | |
2138 | end = util.timer() |
|
2138 | end = util.timer() | |
2139 | # not very stable timing since we did only one run |
|
2139 | # not very stable timing since we did only one run | |
2140 | data['time'] = end - begin |
|
2140 | data['time'] = end - begin | |
2141 | data['nbrenamedfiles'] = len(renames) |
|
2141 | data['nbrenamedfiles'] = len(renames) | |
2142 | if dostats: |
|
2142 | if dostats: | |
2143 | alldata['time'].append( |
|
2143 | alldata['time'].append( | |
2144 | (data['time'], base.hex(), parent.hex(),) |
|
2144 | (data['time'], base.hex(), parent.hex(),) | |
2145 | ) |
|
2145 | ) | |
2146 | alldata['nbrenames'].append( |
|
2146 | alldata['nbrenames'].append( | |
2147 | (data['nbrenamedfiles'], base.hex(), parent.hex(),) |
|
2147 | (data['nbrenamedfiles'], base.hex(), parent.hex(),) | |
2148 | ) |
|
2148 | ) | |
2149 | fm.startitem() |
|
2149 | fm.startitem() | |
2150 | fm.data(**data) |
|
2150 | fm.data(**data) | |
2151 | out = data.copy() |
|
2151 | out = data.copy() | |
2152 | out['source'] = fm.hexfunc(base.node()) |
|
2152 | out['source'] = fm.hexfunc(base.node()) | |
2153 | out['destination'] = fm.hexfunc(parent.node()) |
|
2153 | out['destination'] = fm.hexfunc(parent.node()) | |
2154 | fm.plain(output % out) |
|
2154 | fm.plain(output % out) | |
2155 |
|
2155 | |||
2156 | fm.end() |
|
2156 | fm.end() | |
2157 | if dostats: |
|
2157 | if dostats: | |
2158 | # use a second formatter because the data are quite different, not sure |
|
2158 | # use a second formatter because the data are quite different, not sure | |
2159 | # how it flies with the templater. |
|
2159 | # how it flies with the templater. | |
2160 | fm = ui.formatter(b'perf', opts) |
|
2160 | fm = ui.formatter(b'perf', opts) | |
2161 | entries = [ |
|
2161 | entries = [ | |
2162 | ('nbrevs', 'number of revision covered'), |
|
2162 | ('nbrevs', 'number of revision covered'), | |
2163 | ('nbmissingfiles', 'number of missing files at head'), |
|
2163 | ('nbmissingfiles', 'number of missing files at head'), | |
2164 | ] |
|
2164 | ] | |
2165 | if dotiming: |
|
2165 | if dotiming: | |
2166 | entries.append(('nbrenames', 'renamed files')) |
|
2166 | entries.append(('nbrenames', 'renamed files')) | |
2167 | entries.append(('time', 'time')) |
|
2167 | entries.append(('time', 'time')) | |
2168 | _displaystats(ui, opts, entries, alldata) |
|
2168 | _displaystats(ui, opts, entries, alldata) | |
2169 |
|
2169 | |||
2170 |
|
2170 | |||
2171 | @command(b'perfcca', formatteropts) |
|
2171 | @command(b'perfcca', formatteropts) | |
2172 | def perfcca(ui, repo, **opts): |
|
2172 | def perfcca(ui, repo, **opts): | |
2173 | opts = _byteskwargs(opts) |
|
2173 | opts = _byteskwargs(opts) | |
2174 | timer, fm = gettimer(ui, opts) |
|
2174 | timer, fm = gettimer(ui, opts) | |
2175 | timer(lambda: scmutil.casecollisionauditor(ui, False, repo.dirstate)) |
|
2175 | timer(lambda: scmutil.casecollisionauditor(ui, False, repo.dirstate)) | |
2176 | fm.end() |
|
2176 | fm.end() | |
2177 |
|
2177 | |||
2178 |
|
2178 | |||
2179 | @command(b'perffncacheload', formatteropts) |
|
2179 | @command(b'perffncacheload', formatteropts) | |
2180 | def perffncacheload(ui, repo, **opts): |
|
2180 | def perffncacheload(ui, repo, **opts): | |
2181 | opts = _byteskwargs(opts) |
|
2181 | opts = _byteskwargs(opts) | |
2182 | timer, fm = gettimer(ui, opts) |
|
2182 | timer, fm = gettimer(ui, opts) | |
2183 | s = repo.store |
|
2183 | s = repo.store | |
2184 |
|
2184 | |||
2185 | def d(): |
|
2185 | def d(): | |
2186 | s.fncache._load() |
|
2186 | s.fncache._load() | |
2187 |
|
2187 | |||
2188 | timer(d) |
|
2188 | timer(d) | |
2189 | fm.end() |
|
2189 | fm.end() | |
2190 |
|
2190 | |||
2191 |
|
2191 | |||
2192 | @command(b'perffncachewrite', formatteropts) |
|
2192 | @command(b'perffncachewrite', formatteropts) | |
2193 | def perffncachewrite(ui, repo, **opts): |
|
2193 | def perffncachewrite(ui, repo, **opts): | |
2194 | opts = _byteskwargs(opts) |
|
2194 | opts = _byteskwargs(opts) | |
2195 | timer, fm = gettimer(ui, opts) |
|
2195 | timer, fm = gettimer(ui, opts) | |
2196 | s = repo.store |
|
2196 | s = repo.store | |
2197 | lock = repo.lock() |
|
2197 | lock = repo.lock() | |
2198 | s.fncache._load() |
|
2198 | s.fncache._load() | |
2199 | tr = repo.transaction(b'perffncachewrite') |
|
2199 | tr = repo.transaction(b'perffncachewrite') | |
2200 | tr.addbackup(b'fncache') |
|
2200 | tr.addbackup(b'fncache') | |
2201 |
|
2201 | |||
2202 | def d(): |
|
2202 | def d(): | |
2203 | s.fncache._dirty = True |
|
2203 | s.fncache._dirty = True | |
2204 | s.fncache.write(tr) |
|
2204 | s.fncache.write(tr) | |
2205 |
|
2205 | |||
2206 | timer(d) |
|
2206 | timer(d) | |
2207 | tr.close() |
|
2207 | tr.close() | |
2208 | lock.release() |
|
2208 | lock.release() | |
2209 | fm.end() |
|
2209 | fm.end() | |
2210 |
|
2210 | |||
2211 |
|
2211 | |||
2212 | @command(b'perffncacheencode', formatteropts) |
|
2212 | @command(b'perffncacheencode', formatteropts) | |
2213 | def perffncacheencode(ui, repo, **opts): |
|
2213 | def perffncacheencode(ui, repo, **opts): | |
2214 | opts = _byteskwargs(opts) |
|
2214 | opts = _byteskwargs(opts) | |
2215 | timer, fm = gettimer(ui, opts) |
|
2215 | timer, fm = gettimer(ui, opts) | |
2216 | s = repo.store |
|
2216 | s = repo.store | |
2217 | s.fncache._load() |
|
2217 | s.fncache._load() | |
2218 |
|
2218 | |||
2219 | def d(): |
|
2219 | def d(): | |
2220 | for p in s.fncache.entries: |
|
2220 | for p in s.fncache.entries: | |
2221 | s.encode(p) |
|
2221 | s.encode(p) | |
2222 |
|
2222 | |||
2223 | timer(d) |
|
2223 | timer(d) | |
2224 | fm.end() |
|
2224 | fm.end() | |
2225 |
|
2225 | |||
2226 |
|
2226 | |||
2227 | def _bdiffworker(q, blocks, xdiff, ready, done): |
|
2227 | def _bdiffworker(q, blocks, xdiff, ready, done): | |
2228 | while not done.is_set(): |
|
2228 | while not done.is_set(): | |
2229 | pair = q.get() |
|
2229 | pair = q.get() | |
2230 | while pair is not None: |
|
2230 | while pair is not None: | |
2231 | if xdiff: |
|
2231 | if xdiff: | |
2232 | mdiff.bdiff.xdiffblocks(*pair) |
|
2232 | mdiff.bdiff.xdiffblocks(*pair) | |
2233 | elif blocks: |
|
2233 | elif blocks: | |
2234 | mdiff.bdiff.blocks(*pair) |
|
2234 | mdiff.bdiff.blocks(*pair) | |
2235 | else: |
|
2235 | else: | |
2236 | mdiff.textdiff(*pair) |
|
2236 | mdiff.textdiff(*pair) | |
2237 | q.task_done() |
|
2237 | q.task_done() | |
2238 | pair = q.get() |
|
2238 | pair = q.get() | |
2239 | q.task_done() # for the None one |
|
2239 | q.task_done() # for the None one | |
2240 | with ready: |
|
2240 | with ready: | |
2241 | ready.wait() |
|
2241 | ready.wait() | |
2242 |
|
2242 | |||
2243 |
|
2243 | |||
2244 | def _manifestrevision(repo, mnode): |
|
2244 | def _manifestrevision(repo, mnode): | |
2245 | ml = repo.manifestlog |
|
2245 | ml = repo.manifestlog | |
2246 |
|
2246 | |||
2247 | if util.safehasattr(ml, b'getstorage'): |
|
2247 | if util.safehasattr(ml, b'getstorage'): | |
2248 | store = ml.getstorage(b'') |
|
2248 | store = ml.getstorage(b'') | |
2249 | else: |
|
2249 | else: | |
2250 | store = ml._revlog |
|
2250 | store = ml._revlog | |
2251 |
|
2251 | |||
2252 | return store.revision(mnode) |
|
2252 | return store.revision(mnode) | |
2253 |
|
2253 | |||
2254 |
|
2254 | |||
2255 | @command( |
|
2255 | @command( | |
2256 | b'perfbdiff', |
|
2256 | b'perfbdiff', | |
2257 | revlogopts |
|
2257 | revlogopts | |
2258 | + formatteropts |
|
2258 | + formatteropts | |
2259 | + [ |
|
2259 | + [ | |
2260 | ( |
|
2260 | ( | |
2261 | b'', |
|
2261 | b'', | |
2262 | b'count', |
|
2262 | b'count', | |
2263 | 1, |
|
2263 | 1, | |
2264 | b'number of revisions to test (when using --startrev)', |
|
2264 | b'number of revisions to test (when using --startrev)', | |
2265 | ), |
|
2265 | ), | |
2266 | (b'', b'alldata', False, b'test bdiffs for all associated revisions'), |
|
2266 | (b'', b'alldata', False, b'test bdiffs for all associated revisions'), | |
2267 | (b'', b'threads', 0, b'number of thread to use (disable with 0)'), |
|
2267 | (b'', b'threads', 0, b'number of thread to use (disable with 0)'), | |
2268 | (b'', b'blocks', False, b'test computing diffs into blocks'), |
|
2268 | (b'', b'blocks', False, b'test computing diffs into blocks'), | |
2269 | (b'', b'xdiff', False, b'use xdiff algorithm'), |
|
2269 | (b'', b'xdiff', False, b'use xdiff algorithm'), | |
2270 | ], |
|
2270 | ], | |
2271 | b'-c|-m|FILE REV', |
|
2271 | b'-c|-m|FILE REV', | |
2272 | ) |
|
2272 | ) | |
2273 | def perfbdiff(ui, repo, file_, rev=None, count=None, threads=0, **opts): |
|
2273 | def perfbdiff(ui, repo, file_, rev=None, count=None, threads=0, **opts): | |
2274 | """benchmark a bdiff between revisions |
|
2274 | """benchmark a bdiff between revisions | |
2275 |
|
2275 | |||
2276 | By default, benchmark a bdiff between its delta parent and itself. |
|
2276 | By default, benchmark a bdiff between its delta parent and itself. | |
2277 |
|
2277 | |||
2278 | With ``--count``, benchmark bdiffs between delta parents and self for N |
|
2278 | With ``--count``, benchmark bdiffs between delta parents and self for N | |
2279 | revisions starting at the specified revision. |
|
2279 | revisions starting at the specified revision. | |
2280 |
|
2280 | |||
2281 | With ``--alldata``, assume the requested revision is a changeset and |
|
2281 | With ``--alldata``, assume the requested revision is a changeset and | |
2282 | measure bdiffs for all changes related to that changeset (manifest |
|
2282 | measure bdiffs for all changes related to that changeset (manifest | |
2283 | and filelogs). |
|
2283 | and filelogs). | |
2284 | """ |
|
2284 | """ | |
2285 | opts = _byteskwargs(opts) |
|
2285 | opts = _byteskwargs(opts) | |
2286 |
|
2286 | |||
2287 | if opts[b'xdiff'] and not opts[b'blocks']: |
|
2287 | if opts[b'xdiff'] and not opts[b'blocks']: | |
2288 | raise error.CommandError(b'perfbdiff', b'--xdiff requires --blocks') |
|
2288 | raise error.CommandError(b'perfbdiff', b'--xdiff requires --blocks') | |
2289 |
|
2289 | |||
2290 | if opts[b'alldata']: |
|
2290 | if opts[b'alldata']: | |
2291 | opts[b'changelog'] = True |
|
2291 | opts[b'changelog'] = True | |
2292 |
|
2292 | |||
2293 | if opts.get(b'changelog') or opts.get(b'manifest'): |
|
2293 | if opts.get(b'changelog') or opts.get(b'manifest'): | |
2294 | file_, rev = None, file_ |
|
2294 | file_, rev = None, file_ | |
2295 | elif rev is None: |
|
2295 | elif rev is None: | |
2296 | raise error.CommandError(b'perfbdiff', b'invalid arguments') |
|
2296 | raise error.CommandError(b'perfbdiff', b'invalid arguments') | |
2297 |
|
2297 | |||
2298 | blocks = opts[b'blocks'] |
|
2298 | blocks = opts[b'blocks'] | |
2299 | xdiff = opts[b'xdiff'] |
|
2299 | xdiff = opts[b'xdiff'] | |
2300 | textpairs = [] |
|
2300 | textpairs = [] | |
2301 |
|
2301 | |||
2302 | r = cmdutil.openrevlog(repo, b'perfbdiff', file_, opts) |
|
2302 | r = cmdutil.openrevlog(repo, b'perfbdiff', file_, opts) | |
2303 |
|
2303 | |||
2304 | startrev = r.rev(r.lookup(rev)) |
|
2304 | startrev = r.rev(r.lookup(rev)) | |
2305 | for rev in range(startrev, min(startrev + count, len(r) - 1)): |
|
2305 | for rev in range(startrev, min(startrev + count, len(r) - 1)): | |
2306 | if opts[b'alldata']: |
|
2306 | if opts[b'alldata']: | |
2307 | # Load revisions associated with changeset. |
|
2307 | # Load revisions associated with changeset. | |
2308 | ctx = repo[rev] |
|
2308 | ctx = repo[rev] | |
2309 | mtext = _manifestrevision(repo, ctx.manifestnode()) |
|
2309 | mtext = _manifestrevision(repo, ctx.manifestnode()) | |
2310 | for pctx in ctx.parents(): |
|
2310 | for pctx in ctx.parents(): | |
2311 | pman = _manifestrevision(repo, pctx.manifestnode()) |
|
2311 | pman = _manifestrevision(repo, pctx.manifestnode()) | |
2312 | textpairs.append((pman, mtext)) |
|
2312 | textpairs.append((pman, mtext)) | |
2313 |
|
2313 | |||
2314 | # Load filelog revisions by iterating manifest delta. |
|
2314 | # Load filelog revisions by iterating manifest delta. | |
2315 | man = ctx.manifest() |
|
2315 | man = ctx.manifest() | |
2316 | pman = ctx.p1().manifest() |
|
2316 | pman = ctx.p1().manifest() | |
2317 | for filename, change in pman.diff(man).items(): |
|
2317 | for filename, change in pman.diff(man).items(): | |
2318 | fctx = repo.file(filename) |
|
2318 | fctx = repo.file(filename) | |
2319 | f1 = fctx.revision(change[0][0] or -1) |
|
2319 | f1 = fctx.revision(change[0][0] or -1) | |
2320 | f2 = fctx.revision(change[1][0] or -1) |
|
2320 | f2 = fctx.revision(change[1][0] or -1) | |
2321 | textpairs.append((f1, f2)) |
|
2321 | textpairs.append((f1, f2)) | |
2322 | else: |
|
2322 | else: | |
2323 | dp = r.deltaparent(rev) |
|
2323 | dp = r.deltaparent(rev) | |
2324 | textpairs.append((r.revision(dp), r.revision(rev))) |
|
2324 | textpairs.append((r.revision(dp), r.revision(rev))) | |
2325 |
|
2325 | |||
2326 | withthreads = threads > 0 |
|
2326 | withthreads = threads > 0 | |
2327 | if not withthreads: |
|
2327 | if not withthreads: | |
2328 |
|
2328 | |||
2329 | def d(): |
|
2329 | def d(): | |
2330 | for pair in textpairs: |
|
2330 | for pair in textpairs: | |
2331 | if xdiff: |
|
2331 | if xdiff: | |
2332 | mdiff.bdiff.xdiffblocks(*pair) |
|
2332 | mdiff.bdiff.xdiffblocks(*pair) | |
2333 | elif blocks: |
|
2333 | elif blocks: | |
2334 | mdiff.bdiff.blocks(*pair) |
|
2334 | mdiff.bdiff.blocks(*pair) | |
2335 | else: |
|
2335 | else: | |
2336 | mdiff.textdiff(*pair) |
|
2336 | mdiff.textdiff(*pair) | |
2337 |
|
2337 | |||
2338 | else: |
|
2338 | else: | |
2339 | q = queue() |
|
2339 | q = queue() | |
2340 | for i in _xrange(threads): |
|
2340 | for i in _xrange(threads): | |
2341 | q.put(None) |
|
2341 | q.put(None) | |
2342 | ready = threading.Condition() |
|
2342 | ready = threading.Condition() | |
2343 | done = threading.Event() |
|
2343 | done = threading.Event() | |
2344 | for i in _xrange(threads): |
|
2344 | for i in _xrange(threads): | |
2345 | threading.Thread( |
|
2345 | threading.Thread( | |
2346 | target=_bdiffworker, args=(q, blocks, xdiff, ready, done) |
|
2346 | target=_bdiffworker, args=(q, blocks, xdiff, ready, done) | |
2347 | ).start() |
|
2347 | ).start() | |
2348 | q.join() |
|
2348 | q.join() | |
2349 |
|
2349 | |||
2350 | def d(): |
|
2350 | def d(): | |
2351 | for pair in textpairs: |
|
2351 | for pair in textpairs: | |
2352 | q.put(pair) |
|
2352 | q.put(pair) | |
2353 | for i in _xrange(threads): |
|
2353 | for i in _xrange(threads): | |
2354 | q.put(None) |
|
2354 | q.put(None) | |
2355 | with ready: |
|
2355 | with ready: | |
2356 | ready.notify_all() |
|
2356 | ready.notify_all() | |
2357 | q.join() |
|
2357 | q.join() | |
2358 |
|
2358 | |||
2359 | timer, fm = gettimer(ui, opts) |
|
2359 | timer, fm = gettimer(ui, opts) | |
2360 | timer(d) |
|
2360 | timer(d) | |
2361 | fm.end() |
|
2361 | fm.end() | |
2362 |
|
2362 | |||
2363 | if withthreads: |
|
2363 | if withthreads: | |
2364 | done.set() |
|
2364 | done.set() | |
2365 | for i in _xrange(threads): |
|
2365 | for i in _xrange(threads): | |
2366 | q.put(None) |
|
2366 | q.put(None) | |
2367 | with ready: |
|
2367 | with ready: | |
2368 | ready.notify_all() |
|
2368 | ready.notify_all() | |
2369 |
|
2369 | |||
2370 |
|
2370 | |||
2371 | @command( |
|
2371 | @command( | |
2372 | b'perfunidiff', |
|
2372 | b'perfunidiff', | |
2373 | revlogopts |
|
2373 | revlogopts | |
2374 | + formatteropts |
|
2374 | + formatteropts | |
2375 | + [ |
|
2375 | + [ | |
2376 | ( |
|
2376 | ( | |
2377 | b'', |
|
2377 | b'', | |
2378 | b'count', |
|
2378 | b'count', | |
2379 | 1, |
|
2379 | 1, | |
2380 | b'number of revisions to test (when using --startrev)', |
|
2380 | b'number of revisions to test (when using --startrev)', | |
2381 | ), |
|
2381 | ), | |
2382 | (b'', b'alldata', False, b'test unidiffs for all associated revisions'), |
|
2382 | (b'', b'alldata', False, b'test unidiffs for all associated revisions'), | |
2383 | ], |
|
2383 | ], | |
2384 | b'-c|-m|FILE REV', |
|
2384 | b'-c|-m|FILE REV', | |
2385 | ) |
|
2385 | ) | |
2386 | def perfunidiff(ui, repo, file_, rev=None, count=None, **opts): |
|
2386 | def perfunidiff(ui, repo, file_, rev=None, count=None, **opts): | |
2387 | """benchmark a unified diff between revisions |
|
2387 | """benchmark a unified diff between revisions | |
2388 |
|
2388 | |||
2389 | This doesn't include any copy tracing - it's just a unified diff |
|
2389 | This doesn't include any copy tracing - it's just a unified diff | |
2390 | of the texts. |
|
2390 | of the texts. | |
2391 |
|
2391 | |||
2392 | By default, benchmark a diff between its delta parent and itself. |
|
2392 | By default, benchmark a diff between its delta parent and itself. | |
2393 |
|
2393 | |||
2394 | With ``--count``, benchmark diffs between delta parents and self for N |
|
2394 | With ``--count``, benchmark diffs between delta parents and self for N | |
2395 | revisions starting at the specified revision. |
|
2395 | revisions starting at the specified revision. | |
2396 |
|
2396 | |||
2397 | With ``--alldata``, assume the requested revision is a changeset and |
|
2397 | With ``--alldata``, assume the requested revision is a changeset and | |
2398 | measure diffs for all changes related to that changeset (manifest |
|
2398 | measure diffs for all changes related to that changeset (manifest | |
2399 | and filelogs). |
|
2399 | and filelogs). | |
2400 | """ |
|
2400 | """ | |
2401 | opts = _byteskwargs(opts) |
|
2401 | opts = _byteskwargs(opts) | |
2402 | if opts[b'alldata']: |
|
2402 | if opts[b'alldata']: | |
2403 | opts[b'changelog'] = True |
|
2403 | opts[b'changelog'] = True | |
2404 |
|
2404 | |||
2405 | if opts.get(b'changelog') or opts.get(b'manifest'): |
|
2405 | if opts.get(b'changelog') or opts.get(b'manifest'): | |
2406 | file_, rev = None, file_ |
|
2406 | file_, rev = None, file_ | |
2407 | elif rev is None: |
|
2407 | elif rev is None: | |
2408 | raise error.CommandError(b'perfunidiff', b'invalid arguments') |
|
2408 | raise error.CommandError(b'perfunidiff', b'invalid arguments') | |
2409 |
|
2409 | |||
2410 | textpairs = [] |
|
2410 | textpairs = [] | |
2411 |
|
2411 | |||
2412 | r = cmdutil.openrevlog(repo, b'perfunidiff', file_, opts) |
|
2412 | r = cmdutil.openrevlog(repo, b'perfunidiff', file_, opts) | |
2413 |
|
2413 | |||
2414 | startrev = r.rev(r.lookup(rev)) |
|
2414 | startrev = r.rev(r.lookup(rev)) | |
2415 | for rev in range(startrev, min(startrev + count, len(r) - 1)): |
|
2415 | for rev in range(startrev, min(startrev + count, len(r) - 1)): | |
2416 | if opts[b'alldata']: |
|
2416 | if opts[b'alldata']: | |
2417 | # Load revisions associated with changeset. |
|
2417 | # Load revisions associated with changeset. | |
2418 | ctx = repo[rev] |
|
2418 | ctx = repo[rev] | |
2419 | mtext = _manifestrevision(repo, ctx.manifestnode()) |
|
2419 | mtext = _manifestrevision(repo, ctx.manifestnode()) | |
2420 | for pctx in ctx.parents(): |
|
2420 | for pctx in ctx.parents(): | |
2421 | pman = _manifestrevision(repo, pctx.manifestnode()) |
|
2421 | pman = _manifestrevision(repo, pctx.manifestnode()) | |
2422 | textpairs.append((pman, mtext)) |
|
2422 | textpairs.append((pman, mtext)) | |
2423 |
|
2423 | |||
2424 | # Load filelog revisions by iterating manifest delta. |
|
2424 | # Load filelog revisions by iterating manifest delta. | |
2425 | man = ctx.manifest() |
|
2425 | man = ctx.manifest() | |
2426 | pman = ctx.p1().manifest() |
|
2426 | pman = ctx.p1().manifest() | |
2427 | for filename, change in pman.diff(man).items(): |
|
2427 | for filename, change in pman.diff(man).items(): | |
2428 | fctx = repo.file(filename) |
|
2428 | fctx = repo.file(filename) | |
2429 | f1 = fctx.revision(change[0][0] or -1) |
|
2429 | f1 = fctx.revision(change[0][0] or -1) | |
2430 | f2 = fctx.revision(change[1][0] or -1) |
|
2430 | f2 = fctx.revision(change[1][0] or -1) | |
2431 | textpairs.append((f1, f2)) |
|
2431 | textpairs.append((f1, f2)) | |
2432 | else: |
|
2432 | else: | |
2433 | dp = r.deltaparent(rev) |
|
2433 | dp = r.deltaparent(rev) | |
2434 | textpairs.append((r.revision(dp), r.revision(rev))) |
|
2434 | textpairs.append((r.revision(dp), r.revision(rev))) | |
2435 |
|
2435 | |||
2436 | def d(): |
|
2436 | def d(): | |
2437 | for left, right in textpairs: |
|
2437 | for left, right in textpairs: | |
2438 | # The date strings don't matter, so we pass empty strings. |
|
2438 | # The date strings don't matter, so we pass empty strings. | |
2439 | headerlines, hunks = mdiff.unidiff( |
|
2439 | headerlines, hunks = mdiff.unidiff( | |
2440 | left, b'', right, b'', b'left', b'right', binary=False |
|
2440 | left, b'', right, b'', b'left', b'right', binary=False | |
2441 | ) |
|
2441 | ) | |
2442 | # consume iterators in roughly the way patch.py does |
|
2442 | # consume iterators in roughly the way patch.py does | |
2443 | b'\n'.join(headerlines) |
|
2443 | b'\n'.join(headerlines) | |
2444 | b''.join(sum((list(hlines) for hrange, hlines in hunks), [])) |
|
2444 | b''.join(sum((list(hlines) for hrange, hlines in hunks), [])) | |
2445 |
|
2445 | |||
2446 | timer, fm = gettimer(ui, opts) |
|
2446 | timer, fm = gettimer(ui, opts) | |
2447 | timer(d) |
|
2447 | timer(d) | |
2448 | fm.end() |
|
2448 | fm.end() | |
2449 |
|
2449 | |||
2450 |
|
2450 | |||
2451 | @command(b'perfdiffwd', formatteropts) |
|
2451 | @command(b'perfdiffwd', formatteropts) | |
2452 | def perfdiffwd(ui, repo, **opts): |
|
2452 | def perfdiffwd(ui, repo, **opts): | |
2453 | """Profile diff of working directory changes""" |
|
2453 | """Profile diff of working directory changes""" | |
2454 | opts = _byteskwargs(opts) |
|
2454 | opts = _byteskwargs(opts) | |
2455 | timer, fm = gettimer(ui, opts) |
|
2455 | timer, fm = gettimer(ui, opts) | |
2456 | options = { |
|
2456 | options = { | |
2457 | 'w': 'ignore_all_space', |
|
2457 | 'w': 'ignore_all_space', | |
2458 | 'b': 'ignore_space_change', |
|
2458 | 'b': 'ignore_space_change', | |
2459 | 'B': 'ignore_blank_lines', |
|
2459 | 'B': 'ignore_blank_lines', | |
2460 | } |
|
2460 | } | |
2461 |
|
2461 | |||
2462 | for diffopt in ('', 'w', 'b', 'B', 'wB'): |
|
2462 | for diffopt in ('', 'w', 'b', 'B', 'wB'): | |
2463 | opts = dict((options[c], b'1') for c in diffopt) |
|
2463 | opts = dict((options[c], b'1') for c in diffopt) | |
2464 |
|
2464 | |||
2465 | def d(): |
|
2465 | def d(): | |
2466 | ui.pushbuffer() |
|
2466 | ui.pushbuffer() | |
2467 | commands.diff(ui, repo, **opts) |
|
2467 | commands.diff(ui, repo, **opts) | |
2468 | ui.popbuffer() |
|
2468 | ui.popbuffer() | |
2469 |
|
2469 | |||
2470 | diffopt = diffopt.encode('ascii') |
|
2470 | diffopt = diffopt.encode('ascii') | |
2471 | title = b'diffopts: %s' % (diffopt and (b'-' + diffopt) or b'none') |
|
2471 | title = b'diffopts: %s' % (diffopt and (b'-' + diffopt) or b'none') | |
2472 | timer(d, title=title) |
|
2472 | timer(d, title=title) | |
2473 | fm.end() |
|
2473 | fm.end() | |
2474 |
|
2474 | |||
2475 |
|
2475 | |||
2476 | @command(b'perfrevlogindex', revlogopts + formatteropts, b'-c|-m|FILE') |
|
2476 | @command(b'perfrevlogindex', revlogopts + formatteropts, b'-c|-m|FILE') | |
2477 | def perfrevlogindex(ui, repo, file_=None, **opts): |
|
2477 | def perfrevlogindex(ui, repo, file_=None, **opts): | |
2478 | """Benchmark operations against a revlog index. |
|
2478 | """Benchmark operations against a revlog index. | |
2479 |
|
2479 | |||
2480 | This tests constructing a revlog instance, reading index data, |
|
2480 | This tests constructing a revlog instance, reading index data, | |
2481 | parsing index data, and performing various operations related to |
|
2481 | parsing index data, and performing various operations related to | |
2482 | index data. |
|
2482 | index data. | |
2483 | """ |
|
2483 | """ | |
2484 |
|
2484 | |||
2485 | opts = _byteskwargs(opts) |
|
2485 | opts = _byteskwargs(opts) | |
2486 |
|
2486 | |||
2487 | rl = cmdutil.openrevlog(repo, b'perfrevlogindex', file_, opts) |
|
2487 | rl = cmdutil.openrevlog(repo, b'perfrevlogindex', file_, opts) | |
2488 |
|
2488 | |||
2489 | opener = getattr(rl, 'opener') # trick linter |
|
2489 | opener = getattr(rl, 'opener') # trick linter | |
2490 | indexfile = rl.indexfile |
|
2490 | indexfile = rl.indexfile | |
2491 | data = opener.read(indexfile) |
|
2491 | data = opener.read(indexfile) | |
2492 |
|
2492 | |||
2493 | header = struct.unpack(b'>I', data[0:4])[0] |
|
2493 | header = struct.unpack(b'>I', data[0:4])[0] | |
2494 | version = header & 0xFFFF |
|
2494 | version = header & 0xFFFF | |
2495 | if version == 1: |
|
2495 | if version == 1: | |
2496 | revlogio = revlog.revlogio() |
|
2496 | revlogio = revlog.revlogio() | |
2497 | inline = header & (1 << 16) |
|
2497 | inline = header & (1 << 16) | |
2498 | else: |
|
2498 | else: | |
2499 | raise error.Abort(b'unsupported revlog version: %d' % version) |
|
2499 | raise error.Abort(b'unsupported revlog version: %d' % version) | |
2500 |
|
2500 | |||
2501 | rllen = len(rl) |
|
2501 | rllen = len(rl) | |
2502 |
|
2502 | |||
2503 | node0 = rl.node(0) |
|
2503 | node0 = rl.node(0) | |
2504 | node25 = rl.node(rllen // 4) |
|
2504 | node25 = rl.node(rllen // 4) | |
2505 | node50 = rl.node(rllen // 2) |
|
2505 | node50 = rl.node(rllen // 2) | |
2506 | node75 = rl.node(rllen // 4 * 3) |
|
2506 | node75 = rl.node(rllen // 4 * 3) | |
2507 | node100 = rl.node(rllen - 1) |
|
2507 | node100 = rl.node(rllen - 1) | |
2508 |
|
2508 | |||
2509 | allrevs = range(rllen) |
|
2509 | allrevs = range(rllen) | |
2510 | allrevsrev = list(reversed(allrevs)) |
|
2510 | allrevsrev = list(reversed(allrevs)) | |
2511 | allnodes = [rl.node(rev) for rev in range(rllen)] |
|
2511 | allnodes = [rl.node(rev) for rev in range(rllen)] | |
2512 | allnodesrev = list(reversed(allnodes)) |
|
2512 | allnodesrev = list(reversed(allnodes)) | |
2513 |
|
2513 | |||
2514 | def constructor(): |
|
2514 | def constructor(): | |
2515 | revlog.revlog(opener, indexfile) |
|
2515 | revlog.revlog(opener, indexfile) | |
2516 |
|
2516 | |||
2517 | def read(): |
|
2517 | def read(): | |
2518 | with opener(indexfile) as fh: |
|
2518 | with opener(indexfile) as fh: | |
2519 | fh.read() |
|
2519 | fh.read() | |
2520 |
|
2520 | |||
2521 | def parseindex(): |
|
2521 | def parseindex(): | |
2522 | revlogio.parseindex(data, inline) |
|
2522 | revlogio.parseindex(data, inline) | |
2523 |
|
2523 | |||
2524 | def getentry(revornode): |
|
2524 | def getentry(revornode): | |
2525 | index = revlogio.parseindex(data, inline)[0] |
|
2525 | index = revlogio.parseindex(data, inline)[0] | |
2526 | index[revornode] |
|
2526 | index[revornode] | |
2527 |
|
2527 | |||
2528 | def getentries(revs, count=1): |
|
2528 | def getentries(revs, count=1): | |
2529 | index = revlogio.parseindex(data, inline)[0] |
|
2529 | index = revlogio.parseindex(data, inline)[0] | |
2530 |
|
2530 | |||
2531 | for i in range(count): |
|
2531 | for i in range(count): | |
2532 | for rev in revs: |
|
2532 | for rev in revs: | |
2533 | index[rev] |
|
2533 | index[rev] | |
2534 |
|
2534 | |||
2535 | def resolvenode(node): |
|
2535 | def resolvenode(node): | |
2536 | nodemap = revlogio.parseindex(data, inline)[1] |
|
2536 | nodemap = revlogio.parseindex(data, inline)[1] | |
2537 | # This only works for the C code. |
|
2537 | # This only works for the C code. | |
2538 | if nodemap is None: |
|
2538 | if nodemap is None: | |
2539 | return |
|
2539 | return | |
2540 |
|
2540 | |||
2541 | try: |
|
2541 | try: | |
2542 | nodemap[node] |
|
2542 | nodemap[node] | |
2543 | except error.RevlogError: |
|
2543 | except error.RevlogError: | |
2544 | pass |
|
2544 | pass | |
2545 |
|
2545 | |||
2546 | def resolvenodes(nodes, count=1): |
|
2546 | def resolvenodes(nodes, count=1): | |
2547 | nodemap = revlogio.parseindex(data, inline)[1] |
|
2547 | nodemap = revlogio.parseindex(data, inline)[1] | |
2548 | if nodemap is None: |
|
2548 | if nodemap is None: | |
2549 | return |
|
2549 | return | |
2550 |
|
2550 | |||
2551 | for i in range(count): |
|
2551 | for i in range(count): | |
2552 | for node in nodes: |
|
2552 | for node in nodes: | |
2553 | try: |
|
2553 | try: | |
2554 | nodemap[node] |
|
2554 | nodemap[node] | |
2555 | except error.RevlogError: |
|
2555 | except error.RevlogError: | |
2556 | pass |
|
2556 | pass | |
2557 |
|
2557 | |||
2558 | benches = [ |
|
2558 | benches = [ | |
2559 | (constructor, b'revlog constructor'), |
|
2559 | (constructor, b'revlog constructor'), | |
2560 | (read, b'read'), |
|
2560 | (read, b'read'), | |
2561 | (parseindex, b'create index object'), |
|
2561 | (parseindex, b'create index object'), | |
2562 | (lambda: getentry(0), b'retrieve index entry for rev 0'), |
|
2562 | (lambda: getentry(0), b'retrieve index entry for rev 0'), | |
2563 | (lambda: resolvenode(b'a' * 20), b'look up missing node'), |
|
2563 | (lambda: resolvenode(b'a' * 20), b'look up missing node'), | |
2564 | (lambda: resolvenode(node0), b'look up node at rev 0'), |
|
2564 | (lambda: resolvenode(node0), b'look up node at rev 0'), | |
2565 | (lambda: resolvenode(node25), b'look up node at 1/4 len'), |
|
2565 | (lambda: resolvenode(node25), b'look up node at 1/4 len'), | |
2566 | (lambda: resolvenode(node50), b'look up node at 1/2 len'), |
|
2566 | (lambda: resolvenode(node50), b'look up node at 1/2 len'), | |
2567 | (lambda: resolvenode(node75), b'look up node at 3/4 len'), |
|
2567 | (lambda: resolvenode(node75), b'look up node at 3/4 len'), | |
2568 | (lambda: resolvenode(node100), b'look up node at tip'), |
|
2568 | (lambda: resolvenode(node100), b'look up node at tip'), | |
2569 | # 2x variation is to measure caching impact. |
|
2569 | # 2x variation is to measure caching impact. | |
2570 | (lambda: resolvenodes(allnodes), b'look up all nodes (forward)'), |
|
2570 | (lambda: resolvenodes(allnodes), b'look up all nodes (forward)'), | |
2571 | (lambda: resolvenodes(allnodes, 2), b'look up all nodes 2x (forward)'), |
|
2571 | (lambda: resolvenodes(allnodes, 2), b'look up all nodes 2x (forward)'), | |
2572 | (lambda: resolvenodes(allnodesrev), b'look up all nodes (reverse)'), |
|
2572 | (lambda: resolvenodes(allnodesrev), b'look up all nodes (reverse)'), | |
2573 | ( |
|
2573 | ( | |
2574 | lambda: resolvenodes(allnodesrev, 2), |
|
2574 | lambda: resolvenodes(allnodesrev, 2), | |
2575 | b'look up all nodes 2x (reverse)', |
|
2575 | b'look up all nodes 2x (reverse)', | |
2576 | ), |
|
2576 | ), | |
2577 | (lambda: getentries(allrevs), b'retrieve all index entries (forward)'), |
|
2577 | (lambda: getentries(allrevs), b'retrieve all index entries (forward)'), | |
2578 | ( |
|
2578 | ( | |
2579 | lambda: getentries(allrevs, 2), |
|
2579 | lambda: getentries(allrevs, 2), | |
2580 | b'retrieve all index entries 2x (forward)', |
|
2580 | b'retrieve all index entries 2x (forward)', | |
2581 | ), |
|
2581 | ), | |
2582 | ( |
|
2582 | ( | |
2583 | lambda: getentries(allrevsrev), |
|
2583 | lambda: getentries(allrevsrev), | |
2584 | b'retrieve all index entries (reverse)', |
|
2584 | b'retrieve all index entries (reverse)', | |
2585 | ), |
|
2585 | ), | |
2586 | ( |
|
2586 | ( | |
2587 | lambda: getentries(allrevsrev, 2), |
|
2587 | lambda: getentries(allrevsrev, 2), | |
2588 | b'retrieve all index entries 2x (reverse)', |
|
2588 | b'retrieve all index entries 2x (reverse)', | |
2589 | ), |
|
2589 | ), | |
2590 | ] |
|
2590 | ] | |
2591 |
|
2591 | |||
2592 | for fn, title in benches: |
|
2592 | for fn, title in benches: | |
2593 | timer, fm = gettimer(ui, opts) |
|
2593 | timer, fm = gettimer(ui, opts) | |
2594 | timer(fn, title=title) |
|
2594 | timer(fn, title=title) | |
2595 | fm.end() |
|
2595 | fm.end() | |
2596 |
|
2596 | |||
2597 |
|
2597 | |||
2598 | @command( |
|
2598 | @command( | |
2599 | b'perfrevlogrevisions', |
|
2599 | b'perfrevlogrevisions', | |
2600 | revlogopts |
|
2600 | revlogopts | |
2601 | + formatteropts |
|
2601 | + formatteropts | |
2602 | + [ |
|
2602 | + [ | |
2603 | (b'd', b'dist', 100, b'distance between the revisions'), |
|
2603 | (b'd', b'dist', 100, b'distance between the revisions'), | |
2604 | (b's', b'startrev', 0, b'revision to start reading at'), |
|
2604 | (b's', b'startrev', 0, b'revision to start reading at'), | |
2605 | (b'', b'reverse', False, b'read in reverse'), |
|
2605 | (b'', b'reverse', False, b'read in reverse'), | |
2606 | ], |
|
2606 | ], | |
2607 | b'-c|-m|FILE', |
|
2607 | b'-c|-m|FILE', | |
2608 | ) |
|
2608 | ) | |
2609 | def perfrevlogrevisions( |
|
2609 | def perfrevlogrevisions( | |
2610 | ui, repo, file_=None, startrev=0, reverse=False, **opts |
|
2610 | ui, repo, file_=None, startrev=0, reverse=False, **opts | |
2611 | ): |
|
2611 | ): | |
2612 | """Benchmark reading a series of revisions from a revlog. |
|
2612 | """Benchmark reading a series of revisions from a revlog. | |
2613 |
|
2613 | |||
2614 | By default, we read every ``-d/--dist`` revision from 0 to tip of |
|
2614 | By default, we read every ``-d/--dist`` revision from 0 to tip of | |
2615 | the specified revlog. |
|
2615 | the specified revlog. | |
2616 |
|
2616 | |||
2617 | The start revision can be defined via ``-s/--startrev``. |
|
2617 | The start revision can be defined via ``-s/--startrev``. | |
2618 | """ |
|
2618 | """ | |
2619 | opts = _byteskwargs(opts) |
|
2619 | opts = _byteskwargs(opts) | |
2620 |
|
2620 | |||
2621 | rl = cmdutil.openrevlog(repo, b'perfrevlogrevisions', file_, opts) |
|
2621 | rl = cmdutil.openrevlog(repo, b'perfrevlogrevisions', file_, opts) | |
2622 | rllen = getlen(ui)(rl) |
|
2622 | rllen = getlen(ui)(rl) | |
2623 |
|
2623 | |||
2624 | if startrev < 0: |
|
2624 | if startrev < 0: | |
2625 | startrev = rllen + startrev |
|
2625 | startrev = rllen + startrev | |
2626 |
|
2626 | |||
2627 | def d(): |
|
2627 | def d(): | |
2628 | rl.clearcaches() |
|
2628 | rl.clearcaches() | |
2629 |
|
2629 | |||
2630 | beginrev = startrev |
|
2630 | beginrev = startrev | |
2631 | endrev = rllen |
|
2631 | endrev = rllen | |
2632 | dist = opts[b'dist'] |
|
2632 | dist = opts[b'dist'] | |
2633 |
|
2633 | |||
2634 | if reverse: |
|
2634 | if reverse: | |
2635 | beginrev, endrev = endrev - 1, beginrev - 1 |
|
2635 | beginrev, endrev = endrev - 1, beginrev - 1 | |
2636 | dist = -1 * dist |
|
2636 | dist = -1 * dist | |
2637 |
|
2637 | |||
2638 | for x in _xrange(beginrev, endrev, dist): |
|
2638 | for x in _xrange(beginrev, endrev, dist): | |
2639 | # Old revisions don't support passing int. |
|
2639 | # Old revisions don't support passing int. | |
2640 | n = rl.node(x) |
|
2640 | n = rl.node(x) | |
2641 | rl.revision(n) |
|
2641 | rl.revision(n) | |
2642 |
|
2642 | |||
2643 | timer, fm = gettimer(ui, opts) |
|
2643 | timer, fm = gettimer(ui, opts) | |
2644 | timer(d) |
|
2644 | timer(d) | |
2645 | fm.end() |
|
2645 | fm.end() | |
2646 |
|
2646 | |||
2647 |
|
2647 | |||
2648 | @command( |
|
2648 | @command( | |
2649 | b'perfrevlogwrite', |
|
2649 | b'perfrevlogwrite', | |
2650 | revlogopts |
|
2650 | revlogopts | |
2651 | + formatteropts |
|
2651 | + formatteropts | |
2652 | + [ |
|
2652 | + [ | |
2653 | (b's', b'startrev', 1000, b'revision to start writing at'), |
|
2653 | (b's', b'startrev', 1000, b'revision to start writing at'), | |
2654 | (b'', b'stoprev', -1, b'last revision to write'), |
|
2654 | (b'', b'stoprev', -1, b'last revision to write'), | |
2655 | (b'', b'count', 3, b'number of passes to perform'), |
|
2655 | (b'', b'count', 3, b'number of passes to perform'), | |
2656 | (b'', b'details', False, b'print timing for every revisions tested'), |
|
2656 | (b'', b'details', False, b'print timing for every revisions tested'), | |
2657 | (b'', b'source', b'full', b'the kind of data feed in the revlog'), |
|
2657 | (b'', b'source', b'full', b'the kind of data feed in the revlog'), | |
2658 | (b'', b'lazydeltabase', True, b'try the provided delta first'), |
|
2658 | (b'', b'lazydeltabase', True, b'try the provided delta first'), | |
2659 | (b'', b'clear-caches', True, b'clear revlog cache between calls'), |
|
2659 | (b'', b'clear-caches', True, b'clear revlog cache between calls'), | |
2660 | ], |
|
2660 | ], | |
2661 | b'-c|-m|FILE', |
|
2661 | b'-c|-m|FILE', | |
2662 | ) |
|
2662 | ) | |
2663 | def perfrevlogwrite(ui, repo, file_=None, startrev=1000, stoprev=-1, **opts): |
|
2663 | def perfrevlogwrite(ui, repo, file_=None, startrev=1000, stoprev=-1, **opts): | |
2664 | """Benchmark writing a series of revisions to a revlog. |
|
2664 | """Benchmark writing a series of revisions to a revlog. | |
2665 |
|
2665 | |||
2666 | Possible source values are: |
|
2666 | Possible source values are: | |
2667 | * `full`: add from a full text (default). |
|
2667 | * `full`: add from a full text (default). | |
2668 | * `parent-1`: add from a delta to the first parent |
|
2668 | * `parent-1`: add from a delta to the first parent | |
2669 | * `parent-2`: add from a delta to the second parent if it exists |
|
2669 | * `parent-2`: add from a delta to the second parent if it exists | |
2670 | (use a delta from the first parent otherwise) |
|
2670 | (use a delta from the first parent otherwise) | |
2671 | * `parent-smallest`: add from the smallest delta (either p1 or p2) |
|
2671 | * `parent-smallest`: add from the smallest delta (either p1 or p2) | |
2672 | * `storage`: add from the existing precomputed deltas |
|
2672 | * `storage`: add from the existing precomputed deltas | |
2673 |
|
2673 | |||
2674 | Note: This performance command measures performance in a custom way. As a |
|
2674 | Note: This performance command measures performance in a custom way. As a | |
2675 | result some of the global configuration of the 'perf' command does not |
|
2675 | result some of the global configuration of the 'perf' command does not | |
2676 | apply to it: |
|
2676 | apply to it: | |
2677 |
|
2677 | |||
2678 | * ``pre-run``: disabled |
|
2678 | * ``pre-run``: disabled | |
2679 |
|
2679 | |||
2680 | * ``profile-benchmark``: disabled |
|
2680 | * ``profile-benchmark``: disabled | |
2681 |
|
2681 | |||
2682 | * ``run-limits``: disabled use --count instead |
|
2682 | * ``run-limits``: disabled use --count instead | |
2683 | """ |
|
2683 | """ | |
2684 | opts = _byteskwargs(opts) |
|
2684 | opts = _byteskwargs(opts) | |
2685 |
|
2685 | |||
2686 | rl = cmdutil.openrevlog(repo, b'perfrevlogwrite', file_, opts) |
|
2686 | rl = cmdutil.openrevlog(repo, b'perfrevlogwrite', file_, opts) | |
2687 | rllen = getlen(ui)(rl) |
|
2687 | rllen = getlen(ui)(rl) | |
2688 | if startrev < 0: |
|
2688 | if startrev < 0: | |
2689 | startrev = rllen + startrev |
|
2689 | startrev = rllen + startrev | |
2690 | if stoprev < 0: |
|
2690 | if stoprev < 0: | |
2691 | stoprev = rllen + stoprev |
|
2691 | stoprev = rllen + stoprev | |
2692 |
|
2692 | |||
2693 | lazydeltabase = opts['lazydeltabase'] |
|
2693 | lazydeltabase = opts['lazydeltabase'] | |
2694 | source = opts['source'] |
|
2694 | source = opts['source'] | |
2695 | clearcaches = opts['clear_caches'] |
|
2695 | clearcaches = opts['clear_caches'] | |
2696 | validsource = ( |
|
2696 | validsource = ( | |
2697 | b'full', |
|
2697 | b'full', | |
2698 | b'parent-1', |
|
2698 | b'parent-1', | |
2699 | b'parent-2', |
|
2699 | b'parent-2', | |
2700 | b'parent-smallest', |
|
2700 | b'parent-smallest', | |
2701 | b'storage', |
|
2701 | b'storage', | |
2702 | ) |
|
2702 | ) | |
2703 | if source not in validsource: |
|
2703 | if source not in validsource: | |
2704 | raise error.Abort('invalid source type: %s' % source) |
|
2704 | raise error.Abort('invalid source type: %s' % source) | |
2705 |
|
2705 | |||
2706 | ### actually gather results |
|
2706 | ### actually gather results | |
2707 | count = opts['count'] |
|
2707 | count = opts['count'] | |
2708 | if count <= 0: |
|
2708 | if count <= 0: | |
2709 | raise error.Abort('invalide run count: %d' % count) |
|
2709 | raise error.Abort('invalide run count: %d' % count) | |
2710 | allresults = [] |
|
2710 | allresults = [] | |
2711 | for c in range(count): |
|
2711 | for c in range(count): | |
2712 | timing = _timeonewrite( |
|
2712 | timing = _timeonewrite( | |
2713 | ui, |
|
2713 | ui, | |
2714 | rl, |
|
2714 | rl, | |
2715 | source, |
|
2715 | source, | |
2716 | startrev, |
|
2716 | startrev, | |
2717 | stoprev, |
|
2717 | stoprev, | |
2718 | c + 1, |
|
2718 | c + 1, | |
2719 | lazydeltabase=lazydeltabase, |
|
2719 | lazydeltabase=lazydeltabase, | |
2720 | clearcaches=clearcaches, |
|
2720 | clearcaches=clearcaches, | |
2721 | ) |
|
2721 | ) | |
2722 | allresults.append(timing) |
|
2722 | allresults.append(timing) | |
2723 |
|
2723 | |||
2724 | ### consolidate the results in a single list |
|
2724 | ### consolidate the results in a single list | |
2725 | results = [] |
|
2725 | results = [] | |
2726 | for idx, (rev, t) in enumerate(allresults[0]): |
|
2726 | for idx, (rev, t) in enumerate(allresults[0]): | |
2727 | ts = [t] |
|
2727 | ts = [t] | |
2728 | for other in allresults[1:]: |
|
2728 | for other in allresults[1:]: | |
2729 | orev, ot = other[idx] |
|
2729 | orev, ot = other[idx] | |
2730 | assert orev == rev |
|
2730 | assert orev == rev | |
2731 | ts.append(ot) |
|
2731 | ts.append(ot) | |
2732 | results.append((rev, ts)) |
|
2732 | results.append((rev, ts)) | |
2733 | resultcount = len(results) |
|
2733 | resultcount = len(results) | |
2734 |
|
2734 | |||
2735 | ### Compute and display relevant statistics |
|
2735 | ### Compute and display relevant statistics | |
2736 |
|
2736 | |||
2737 | # get a formatter |
|
2737 | # get a formatter | |
2738 | fm = ui.formatter(b'perf', opts) |
|
2738 | fm = ui.formatter(b'perf', opts) | |
2739 | displayall = ui.configbool(b"perf", b"all-timing", False) |
|
2739 | displayall = ui.configbool(b"perf", b"all-timing", False) | |
2740 |
|
2740 | |||
2741 | # print individual details if requested |
|
2741 | # print individual details if requested | |
2742 | if opts['details']: |
|
2742 | if opts['details']: | |
2743 | for idx, item in enumerate(results, 1): |
|
2743 | for idx, item in enumerate(results, 1): | |
2744 | rev, data = item |
|
2744 | rev, data = item | |
2745 | title = 'revisions #%d of %d, rev %d' % (idx, resultcount, rev) |
|
2745 | title = 'revisions #%d of %d, rev %d' % (idx, resultcount, rev) | |
2746 | formatone(fm, data, title=title, displayall=displayall) |
|
2746 | formatone(fm, data, title=title, displayall=displayall) | |
2747 |
|
2747 | |||
2748 | # sorts results by median time |
|
2748 | # sorts results by median time | |
2749 | results.sort(key=lambda x: sorted(x[1])[len(x[1]) // 2]) |
|
2749 | results.sort(key=lambda x: sorted(x[1])[len(x[1]) // 2]) | |
2750 | # list of (name, index) to display) |
|
2750 | # list of (name, index) to display) | |
2751 | relevants = [ |
|
2751 | relevants = [ | |
2752 | ("min", 0), |
|
2752 | ("min", 0), | |
2753 | ("10%", resultcount * 10 // 100), |
|
2753 | ("10%", resultcount * 10 // 100), | |
2754 | ("25%", resultcount * 25 // 100), |
|
2754 | ("25%", resultcount * 25 // 100), | |
2755 | ("50%", resultcount * 70 // 100), |
|
2755 | ("50%", resultcount * 70 // 100), | |
2756 | ("75%", resultcount * 75 // 100), |
|
2756 | ("75%", resultcount * 75 // 100), | |
2757 | ("90%", resultcount * 90 // 100), |
|
2757 | ("90%", resultcount * 90 // 100), | |
2758 | ("95%", resultcount * 95 // 100), |
|
2758 | ("95%", resultcount * 95 // 100), | |
2759 | ("99%", resultcount * 99 // 100), |
|
2759 | ("99%", resultcount * 99 // 100), | |
2760 | ("99.9%", resultcount * 999 // 1000), |
|
2760 | ("99.9%", resultcount * 999 // 1000), | |
2761 | ("99.99%", resultcount * 9999 // 10000), |
|
2761 | ("99.99%", resultcount * 9999 // 10000), | |
2762 | ("99.999%", resultcount * 99999 // 100000), |
|
2762 | ("99.999%", resultcount * 99999 // 100000), | |
2763 | ("max", -1), |
|
2763 | ("max", -1), | |
2764 | ] |
|
2764 | ] | |
2765 | if not ui.quiet: |
|
2765 | if not ui.quiet: | |
2766 | for name, idx in relevants: |
|
2766 | for name, idx in relevants: | |
2767 | data = results[idx] |
|
2767 | data = results[idx] | |
2768 | title = '%s of %d, rev %d' % (name, resultcount, data[0]) |
|
2768 | title = '%s of %d, rev %d' % (name, resultcount, data[0]) | |
2769 | formatone(fm, data[1], title=title, displayall=displayall) |
|
2769 | formatone(fm, data[1], title=title, displayall=displayall) | |
2770 |
|
2770 | |||
2771 | # XXX summing that many float will not be very precise, we ignore this fact |
|
2771 | # XXX summing that many float will not be very precise, we ignore this fact | |
2772 | # for now |
|
2772 | # for now | |
2773 | totaltime = [] |
|
2773 | totaltime = [] | |
2774 | for item in allresults: |
|
2774 | for item in allresults: | |
2775 | totaltime.append( |
|
2775 | totaltime.append( | |
2776 | ( |
|
2776 | ( | |
2777 | sum(x[1][0] for x in item), |
|
2777 | sum(x[1][0] for x in item), | |
2778 | sum(x[1][1] for x in item), |
|
2778 | sum(x[1][1] for x in item), | |
2779 | sum(x[1][2] for x in item), |
|
2779 | sum(x[1][2] for x in item), | |
2780 | ) |
|
2780 | ) | |
2781 | ) |
|
2781 | ) | |
2782 | formatone( |
|
2782 | formatone( | |
2783 | fm, |
|
2783 | fm, | |
2784 | totaltime, |
|
2784 | totaltime, | |
2785 | title="total time (%d revs)" % resultcount, |
|
2785 | title="total time (%d revs)" % resultcount, | |
2786 | displayall=displayall, |
|
2786 | displayall=displayall, | |
2787 | ) |
|
2787 | ) | |
2788 | fm.end() |
|
2788 | fm.end() | |
2789 |
|
2789 | |||
2790 |
|
2790 | |||
2791 | class _faketr(object): |
|
2791 | class _faketr(object): | |
2792 | def add(s, x, y, z=None): |
|
2792 | def add(s, x, y, z=None): | |
2793 | return None |
|
2793 | return None | |
2794 |
|
2794 | |||
2795 |
|
2795 | |||
2796 | def _timeonewrite( |
|
2796 | def _timeonewrite( | |
2797 | ui, |
|
2797 | ui, | |
2798 | orig, |
|
2798 | orig, | |
2799 | source, |
|
2799 | source, | |
2800 | startrev, |
|
2800 | startrev, | |
2801 | stoprev, |
|
2801 | stoprev, | |
2802 | runidx=None, |
|
2802 | runidx=None, | |
2803 | lazydeltabase=True, |
|
2803 | lazydeltabase=True, | |
2804 | clearcaches=True, |
|
2804 | clearcaches=True, | |
2805 | ): |
|
2805 | ): | |
2806 | timings = [] |
|
2806 | timings = [] | |
2807 | tr = _faketr() |
|
2807 | tr = _faketr() | |
2808 | with _temprevlog(ui, orig, startrev) as dest: |
|
2808 | with _temprevlog(ui, orig, startrev) as dest: | |
2809 | dest._lazydeltabase = lazydeltabase |
|
2809 | dest._lazydeltabase = lazydeltabase | |
2810 | revs = list(orig.revs(startrev, stoprev)) |
|
2810 | revs = list(orig.revs(startrev, stoprev)) | |
2811 | total = len(revs) |
|
2811 | total = len(revs) | |
2812 | topic = 'adding' |
|
2812 | topic = 'adding' | |
2813 | if runidx is not None: |
|
2813 | if runidx is not None: | |
2814 | topic += ' (run #%d)' % runidx |
|
2814 | topic += ' (run #%d)' % runidx | |
2815 | # Support both old and new progress API |
|
2815 | # Support both old and new progress API | |
2816 | if util.safehasattr(ui, 'makeprogress'): |
|
2816 | if util.safehasattr(ui, 'makeprogress'): | |
2817 | progress = ui.makeprogress(topic, unit='revs', total=total) |
|
2817 | progress = ui.makeprogress(topic, unit='revs', total=total) | |
2818 |
|
2818 | |||
2819 | def updateprogress(pos): |
|
2819 | def updateprogress(pos): | |
2820 | progress.update(pos) |
|
2820 | progress.update(pos) | |
2821 |
|
2821 | |||
2822 | def completeprogress(): |
|
2822 | def completeprogress(): | |
2823 | progress.complete() |
|
2823 | progress.complete() | |
2824 |
|
2824 | |||
2825 | else: |
|
2825 | else: | |
2826 |
|
2826 | |||
2827 | def updateprogress(pos): |
|
2827 | def updateprogress(pos): | |
2828 | ui.progress(topic, pos, unit='revs', total=total) |
|
2828 | ui.progress(topic, pos, unit='revs', total=total) | |
2829 |
|
2829 | |||
2830 | def completeprogress(): |
|
2830 | def completeprogress(): | |
2831 | ui.progress(topic, None, unit='revs', total=total) |
|
2831 | ui.progress(topic, None, unit='revs', total=total) | |
2832 |
|
2832 | |||
2833 | for idx, rev in enumerate(revs): |
|
2833 | for idx, rev in enumerate(revs): | |
2834 | updateprogress(idx) |
|
2834 | updateprogress(idx) | |
2835 | addargs, addkwargs = _getrevisionseed(orig, rev, tr, source) |
|
2835 | addargs, addkwargs = _getrevisionseed(orig, rev, tr, source) | |
2836 | if clearcaches: |
|
2836 | if clearcaches: | |
2837 | dest.index.clearcaches() |
|
2837 | dest.index.clearcaches() | |
2838 | dest.clearcaches() |
|
2838 | dest.clearcaches() | |
2839 | with timeone() as r: |
|
2839 | with timeone() as r: | |
2840 | dest.addrawrevision(*addargs, **addkwargs) |
|
2840 | dest.addrawrevision(*addargs, **addkwargs) | |
2841 | timings.append((rev, r[0])) |
|
2841 | timings.append((rev, r[0])) | |
2842 | updateprogress(total) |
|
2842 | updateprogress(total) | |
2843 | completeprogress() |
|
2843 | completeprogress() | |
2844 | return timings |
|
2844 | return timings | |
2845 |
|
2845 | |||
2846 |
|
2846 | |||
2847 | def _getrevisionseed(orig, rev, tr, source): |
|
2847 | def _getrevisionseed(orig, rev, tr, source): | |
2848 | from mercurial.node import nullid |
|
2848 | from mercurial.node import nullid | |
2849 |
|
2849 | |||
2850 | linkrev = orig.linkrev(rev) |
|
2850 | linkrev = orig.linkrev(rev) | |
2851 | node = orig.node(rev) |
|
2851 | node = orig.node(rev) | |
2852 | p1, p2 = orig.parents(node) |
|
2852 | p1, p2 = orig.parents(node) | |
2853 | flags = orig.flags(rev) |
|
2853 | flags = orig.flags(rev) | |
2854 | cachedelta = None |
|
2854 | cachedelta = None | |
2855 | text = None |
|
2855 | text = None | |
2856 |
|
2856 | |||
2857 | if source == b'full': |
|
2857 | if source == b'full': | |
2858 | text = orig.revision(rev) |
|
2858 | text = orig.revision(rev) | |
2859 | elif source == b'parent-1': |
|
2859 | elif source == b'parent-1': | |
2860 | baserev = orig.rev(p1) |
|
2860 | baserev = orig.rev(p1) | |
2861 | cachedelta = (baserev, orig.revdiff(p1, rev)) |
|
2861 | cachedelta = (baserev, orig.revdiff(p1, rev)) | |
2862 | elif source == b'parent-2': |
|
2862 | elif source == b'parent-2': | |
2863 | parent = p2 |
|
2863 | parent = p2 | |
2864 | if p2 == nullid: |
|
2864 | if p2 == nullid: | |
2865 | parent = p1 |
|
2865 | parent = p1 | |
2866 | baserev = orig.rev(parent) |
|
2866 | baserev = orig.rev(parent) | |
2867 | cachedelta = (baserev, orig.revdiff(parent, rev)) |
|
2867 | cachedelta = (baserev, orig.revdiff(parent, rev)) | |
2868 | elif source == b'parent-smallest': |
|
2868 | elif source == b'parent-smallest': | |
2869 | p1diff = orig.revdiff(p1, rev) |
|
2869 | p1diff = orig.revdiff(p1, rev) | |
2870 | parent = p1 |
|
2870 | parent = p1 | |
2871 | diff = p1diff |
|
2871 | diff = p1diff | |
2872 | if p2 != nullid: |
|
2872 | if p2 != nullid: | |
2873 | p2diff = orig.revdiff(p2, rev) |
|
2873 | p2diff = orig.revdiff(p2, rev) | |
2874 | if len(p1diff) > len(p2diff): |
|
2874 | if len(p1diff) > len(p2diff): | |
2875 | parent = p2 |
|
2875 | parent = p2 | |
2876 | diff = p2diff |
|
2876 | diff = p2diff | |
2877 | baserev = orig.rev(parent) |
|
2877 | baserev = orig.rev(parent) | |
2878 | cachedelta = (baserev, diff) |
|
2878 | cachedelta = (baserev, diff) | |
2879 | elif source == b'storage': |
|
2879 | elif source == b'storage': | |
2880 | baserev = orig.deltaparent(rev) |
|
2880 | baserev = orig.deltaparent(rev) | |
2881 | cachedelta = (baserev, orig.revdiff(orig.node(baserev), rev)) |
|
2881 | cachedelta = (baserev, orig.revdiff(orig.node(baserev), rev)) | |
2882 |
|
2882 | |||
2883 | return ( |
|
2883 | return ( | |
2884 | (text, tr, linkrev, p1, p2), |
|
2884 | (text, tr, linkrev, p1, p2), | |
2885 | {'node': node, 'flags': flags, 'cachedelta': cachedelta}, |
|
2885 | {'node': node, 'flags': flags, 'cachedelta': cachedelta}, | |
2886 | ) |
|
2886 | ) | |
2887 |
|
2887 | |||
2888 |
|
2888 | |||
2889 | @contextlib.contextmanager |
|
2889 | @contextlib.contextmanager | |
2890 | def _temprevlog(ui, orig, truncaterev): |
|
2890 | def _temprevlog(ui, orig, truncaterev): | |
2891 | from mercurial import vfs as vfsmod |
|
2891 | from mercurial import vfs as vfsmod | |
2892 |
|
2892 | |||
2893 | if orig._inline: |
|
2893 | if orig._inline: | |
2894 | raise error.Abort('not supporting inline revlog (yet)') |
|
2894 | raise error.Abort('not supporting inline revlog (yet)') | |
2895 | revlogkwargs = {} |
|
2895 | revlogkwargs = {} | |
2896 | k = 'upperboundcomp' |
|
2896 | k = 'upperboundcomp' | |
2897 | if util.safehasattr(orig, k): |
|
2897 | if util.safehasattr(orig, k): | |
2898 | revlogkwargs[k] = getattr(orig, k) |
|
2898 | revlogkwargs[k] = getattr(orig, k) | |
2899 |
|
2899 | |||
2900 | origindexpath = orig.opener.join(orig.indexfile) |
|
2900 | origindexpath = orig.opener.join(orig.indexfile) | |
2901 | origdatapath = orig.opener.join(orig.datafile) |
|
2901 | origdatapath = orig.opener.join(orig.datafile) | |
2902 | indexname = 'revlog.i' |
|
2902 | indexname = 'revlog.i' | |
2903 | dataname = 'revlog.d' |
|
2903 | dataname = 'revlog.d' | |
2904 |
|
2904 | |||
2905 | tmpdir = tempfile.mkdtemp(prefix='tmp-hgperf-') |
|
2905 | tmpdir = tempfile.mkdtemp(prefix='tmp-hgperf-') | |
2906 | try: |
|
2906 | try: | |
2907 | # copy the data file in a temporary directory |
|
2907 | # copy the data file in a temporary directory | |
2908 | ui.debug('copying data in %s\n' % tmpdir) |
|
2908 | ui.debug('copying data in %s\n' % tmpdir) | |
2909 | destindexpath = os.path.join(tmpdir, 'revlog.i') |
|
2909 | destindexpath = os.path.join(tmpdir, 'revlog.i') | |
2910 | destdatapath = os.path.join(tmpdir, 'revlog.d') |
|
2910 | destdatapath = os.path.join(tmpdir, 'revlog.d') | |
2911 | shutil.copyfile(origindexpath, destindexpath) |
|
2911 | shutil.copyfile(origindexpath, destindexpath) | |
2912 | shutil.copyfile(origdatapath, destdatapath) |
|
2912 | shutil.copyfile(origdatapath, destdatapath) | |
2913 |
|
2913 | |||
2914 | # remove the data we want to add again |
|
2914 | # remove the data we want to add again | |
2915 | ui.debug('truncating data to be rewritten\n') |
|
2915 | ui.debug('truncating data to be rewritten\n') | |
2916 | with open(destindexpath, 'ab') as index: |
|
2916 | with open(destindexpath, 'ab') as index: | |
2917 | index.seek(0) |
|
2917 | index.seek(0) | |
2918 | index.truncate(truncaterev * orig._io.size) |
|
2918 | index.truncate(truncaterev * orig._io.size) | |
2919 | with open(destdatapath, 'ab') as data: |
|
2919 | with open(destdatapath, 'ab') as data: | |
2920 | data.seek(0) |
|
2920 | data.seek(0) | |
2921 | data.truncate(orig.start(truncaterev)) |
|
2921 | data.truncate(orig.start(truncaterev)) | |
2922 |
|
2922 | |||
2923 | # instantiate a new revlog from the temporary copy |
|
2923 | # instantiate a new revlog from the temporary copy | |
2924 | ui.debug('truncating adding to be rewritten\n') |
|
2924 | ui.debug('truncating adding to be rewritten\n') | |
2925 | vfs = vfsmod.vfs(tmpdir) |
|
2925 | vfs = vfsmod.vfs(tmpdir) | |
2926 | vfs.options = getattr(orig.opener, 'options', None) |
|
2926 | vfs.options = getattr(orig.opener, 'options', None) | |
2927 |
|
2927 | |||
2928 | dest = revlog.revlog( |
|
2928 | dest = revlog.revlog( | |
2929 | vfs, indexfile=indexname, datafile=dataname, **revlogkwargs |
|
2929 | vfs, indexfile=indexname, datafile=dataname, **revlogkwargs | |
2930 | ) |
|
2930 | ) | |
2931 | if dest._inline: |
|
2931 | if dest._inline: | |
2932 | raise error.Abort('not supporting inline revlog (yet)') |
|
2932 | raise error.Abort('not supporting inline revlog (yet)') | |
2933 | # make sure internals are initialized |
|
2933 | # make sure internals are initialized | |
2934 | dest.revision(len(dest) - 1) |
|
2934 | dest.revision(len(dest) - 1) | |
2935 | yield dest |
|
2935 | yield dest | |
2936 | del dest, vfs |
|
2936 | del dest, vfs | |
2937 | finally: |
|
2937 | finally: | |
2938 | shutil.rmtree(tmpdir, True) |
|
2938 | shutil.rmtree(tmpdir, True) | |
2939 |
|
2939 | |||
2940 |
|
2940 | |||
2941 | @command( |
|
2941 | @command( | |
2942 | b'perfrevlogchunks', |
|
2942 | b'perfrevlogchunks', | |
2943 | revlogopts |
|
2943 | revlogopts | |
2944 | + formatteropts |
|
2944 | + formatteropts | |
2945 | + [ |
|
2945 | + [ | |
2946 | (b'e', b'engines', b'', b'compression engines to use'), |
|
2946 | (b'e', b'engines', b'', b'compression engines to use'), | |
2947 | (b's', b'startrev', 0, b'revision to start at'), |
|
2947 | (b's', b'startrev', 0, b'revision to start at'), | |
2948 | ], |
|
2948 | ], | |
2949 | b'-c|-m|FILE', |
|
2949 | b'-c|-m|FILE', | |
2950 | ) |
|
2950 | ) | |
2951 | def perfrevlogchunks(ui, repo, file_=None, engines=None, startrev=0, **opts): |
|
2951 | def perfrevlogchunks(ui, repo, file_=None, engines=None, startrev=0, **opts): | |
2952 | """Benchmark operations on revlog chunks. |
|
2952 | """Benchmark operations on revlog chunks. | |
2953 |
|
2953 | |||
2954 | Logically, each revlog is a collection of fulltext revisions. However, |
|
2954 | Logically, each revlog is a collection of fulltext revisions. However, | |
2955 | stored within each revlog are "chunks" of possibly compressed data. This |
|
2955 | stored within each revlog are "chunks" of possibly compressed data. This | |
2956 | data needs to be read and decompressed or compressed and written. |
|
2956 | data needs to be read and decompressed or compressed and written. | |
2957 |
|
2957 | |||
2958 | This command measures the time it takes to read+decompress and recompress |
|
2958 | This command measures the time it takes to read+decompress and recompress | |
2959 | chunks in a revlog. It effectively isolates I/O and compression performance. |
|
2959 | chunks in a revlog. It effectively isolates I/O and compression performance. | |
2960 | For measurements of higher-level operations like resolving revisions, |
|
2960 | For measurements of higher-level operations like resolving revisions, | |
2961 | see ``perfrevlogrevisions`` and ``perfrevlogrevision``. |
|
2961 | see ``perfrevlogrevisions`` and ``perfrevlogrevision``. | |
2962 | """ |
|
2962 | """ | |
2963 | opts = _byteskwargs(opts) |
|
2963 | opts = _byteskwargs(opts) | |
2964 |
|
2964 | |||
2965 | rl = cmdutil.openrevlog(repo, b'perfrevlogchunks', file_, opts) |
|
2965 | rl = cmdutil.openrevlog(repo, b'perfrevlogchunks', file_, opts) | |
2966 |
|
2966 | |||
2967 | # _chunkraw was renamed to _getsegmentforrevs. |
|
2967 | # _chunkraw was renamed to _getsegmentforrevs. | |
2968 | try: |
|
2968 | try: | |
2969 | segmentforrevs = rl._getsegmentforrevs |
|
2969 | segmentforrevs = rl._getsegmentforrevs | |
2970 | except AttributeError: |
|
2970 | except AttributeError: | |
2971 | segmentforrevs = rl._chunkraw |
|
2971 | segmentforrevs = rl._chunkraw | |
2972 |
|
2972 | |||
2973 | # Verify engines argument. |
|
2973 | # Verify engines argument. | |
2974 | if engines: |
|
2974 | if engines: | |
2975 | engines = set(e.strip() for e in engines.split(b',')) |
|
2975 | engines = set(e.strip() for e in engines.split(b',')) | |
2976 | for engine in engines: |
|
2976 | for engine in engines: | |
2977 | try: |
|
2977 | try: | |
2978 | util.compressionengines[engine] |
|
2978 | util.compressionengines[engine] | |
2979 | except KeyError: |
|
2979 | except KeyError: | |
2980 | raise error.Abort(b'unknown compression engine: %s' % engine) |
|
2980 | raise error.Abort(b'unknown compression engine: %s' % engine) | |
2981 | else: |
|
2981 | else: | |
2982 | engines = [] |
|
2982 | engines = [] | |
2983 | for e in util.compengines: |
|
2983 | for e in util.compengines: | |
2984 | engine = util.compengines[e] |
|
2984 | engine = util.compengines[e] | |
2985 | try: |
|
2985 | try: | |
2986 | if engine.available(): |
|
2986 | if engine.available(): | |
2987 | engine.revlogcompressor().compress(b'dummy') |
|
2987 | engine.revlogcompressor().compress(b'dummy') | |
2988 | engines.append(e) |
|
2988 | engines.append(e) | |
2989 | except NotImplementedError: |
|
2989 | except NotImplementedError: | |
2990 | pass |
|
2990 | pass | |
2991 |
|
2991 | |||
2992 | revs = list(rl.revs(startrev, len(rl) - 1)) |
|
2992 | revs = list(rl.revs(startrev, len(rl) - 1)) | |
2993 |
|
2993 | |||
2994 | def rlfh(rl): |
|
2994 | def rlfh(rl): | |
2995 | if rl._inline: |
|
2995 | if rl._inline: | |
2996 | return getsvfs(repo)(rl.indexfile) |
|
2996 | return getsvfs(repo)(rl.indexfile) | |
2997 | else: |
|
2997 | else: | |
2998 | return getsvfs(repo)(rl.datafile) |
|
2998 | return getsvfs(repo)(rl.datafile) | |
2999 |
|
2999 | |||
3000 | def doread(): |
|
3000 | def doread(): | |
3001 | rl.clearcaches() |
|
3001 | rl.clearcaches() | |
3002 | for rev in revs: |
|
3002 | for rev in revs: | |
3003 | segmentforrevs(rev, rev) |
|
3003 | segmentforrevs(rev, rev) | |
3004 |
|
3004 | |||
3005 | def doreadcachedfh(): |
|
3005 | def doreadcachedfh(): | |
3006 | rl.clearcaches() |
|
3006 | rl.clearcaches() | |
3007 | fh = rlfh(rl) |
|
3007 | fh = rlfh(rl) | |
3008 | for rev in revs: |
|
3008 | for rev in revs: | |
3009 | segmentforrevs(rev, rev, df=fh) |
|
3009 | segmentforrevs(rev, rev, df=fh) | |
3010 |
|
3010 | |||
3011 | def doreadbatch(): |
|
3011 | def doreadbatch(): | |
3012 | rl.clearcaches() |
|
3012 | rl.clearcaches() | |
3013 | segmentforrevs(revs[0], revs[-1]) |
|
3013 | segmentforrevs(revs[0], revs[-1]) | |
3014 |
|
3014 | |||
3015 | def doreadbatchcachedfh(): |
|
3015 | def doreadbatchcachedfh(): | |
3016 | rl.clearcaches() |
|
3016 | rl.clearcaches() | |
3017 | fh = rlfh(rl) |
|
3017 | fh = rlfh(rl) | |
3018 | segmentforrevs(revs[0], revs[-1], df=fh) |
|
3018 | segmentforrevs(revs[0], revs[-1], df=fh) | |
3019 |
|
3019 | |||
3020 | def dochunk(): |
|
3020 | def dochunk(): | |
3021 | rl.clearcaches() |
|
3021 | rl.clearcaches() | |
3022 | fh = rlfh(rl) |
|
3022 | fh = rlfh(rl) | |
3023 | for rev in revs: |
|
3023 | for rev in revs: | |
3024 | rl._chunk(rev, df=fh) |
|
3024 | rl._chunk(rev, df=fh) | |
3025 |
|
3025 | |||
3026 | chunks = [None] |
|
3026 | chunks = [None] | |
3027 |
|
3027 | |||
3028 | def dochunkbatch(): |
|
3028 | def dochunkbatch(): | |
3029 | rl.clearcaches() |
|
3029 | rl.clearcaches() | |
3030 | fh = rlfh(rl) |
|
3030 | fh = rlfh(rl) | |
3031 | # Save chunks as a side-effect. |
|
3031 | # Save chunks as a side-effect. | |
3032 | chunks[0] = rl._chunks(revs, df=fh) |
|
3032 | chunks[0] = rl._chunks(revs, df=fh) | |
3033 |
|
3033 | |||
3034 | def docompress(compressor): |
|
3034 | def docompress(compressor): | |
3035 | rl.clearcaches() |
|
3035 | rl.clearcaches() | |
3036 |
|
3036 | |||
3037 | try: |
|
3037 | try: | |
3038 | # Swap in the requested compression engine. |
|
3038 | # Swap in the requested compression engine. | |
3039 | oldcompressor = rl._compressor |
|
3039 | oldcompressor = rl._compressor | |
3040 | rl._compressor = compressor |
|
3040 | rl._compressor = compressor | |
3041 | for chunk in chunks[0]: |
|
3041 | for chunk in chunks[0]: | |
3042 | rl.compress(chunk) |
|
3042 | rl.compress(chunk) | |
3043 | finally: |
|
3043 | finally: | |
3044 | rl._compressor = oldcompressor |
|
3044 | rl._compressor = oldcompressor | |
3045 |
|
3045 | |||
3046 | benches = [ |
|
3046 | benches = [ | |
3047 | (lambda: doread(), b'read'), |
|
3047 | (lambda: doread(), b'read'), | |
3048 | (lambda: doreadcachedfh(), b'read w/ reused fd'), |
|
3048 | (lambda: doreadcachedfh(), b'read w/ reused fd'), | |
3049 | (lambda: doreadbatch(), b'read batch'), |
|
3049 | (lambda: doreadbatch(), b'read batch'), | |
3050 | (lambda: doreadbatchcachedfh(), b'read batch w/ reused fd'), |
|
3050 | (lambda: doreadbatchcachedfh(), b'read batch w/ reused fd'), | |
3051 | (lambda: dochunk(), b'chunk'), |
|
3051 | (lambda: dochunk(), b'chunk'), | |
3052 | (lambda: dochunkbatch(), b'chunk batch'), |
|
3052 | (lambda: dochunkbatch(), b'chunk batch'), | |
3053 | ] |
|
3053 | ] | |
3054 |
|
3054 | |||
3055 | for engine in sorted(engines): |
|
3055 | for engine in sorted(engines): | |
3056 | compressor = util.compengines[engine].revlogcompressor() |
|
3056 | compressor = util.compengines[engine].revlogcompressor() | |
3057 | benches.append( |
|
3057 | benches.append( | |
3058 | ( |
|
3058 | ( | |
3059 | functools.partial(docompress, compressor), |
|
3059 | functools.partial(docompress, compressor), | |
3060 | b'compress w/ %s' % engine, |
|
3060 | b'compress w/ %s' % engine, | |
3061 | ) |
|
3061 | ) | |
3062 | ) |
|
3062 | ) | |
3063 |
|
3063 | |||
3064 | for fn, title in benches: |
|
3064 | for fn, title in benches: | |
3065 | timer, fm = gettimer(ui, opts) |
|
3065 | timer, fm = gettimer(ui, opts) | |
3066 | timer(fn, title=title) |
|
3066 | timer(fn, title=title) | |
3067 | fm.end() |
|
3067 | fm.end() | |
3068 |
|
3068 | |||
3069 |
|
3069 | |||
3070 | @command( |
|
3070 | @command( | |
3071 | b'perfrevlogrevision', |
|
3071 | b'perfrevlogrevision', | |
3072 | revlogopts |
|
3072 | revlogopts | |
3073 | + formatteropts |
|
3073 | + formatteropts | |
3074 | + [(b'', b'cache', False, b'use caches instead of clearing')], |
|
3074 | + [(b'', b'cache', False, b'use caches instead of clearing')], | |
3075 | b'-c|-m|FILE REV', |
|
3075 | b'-c|-m|FILE REV', | |
3076 | ) |
|
3076 | ) | |
3077 | def perfrevlogrevision(ui, repo, file_, rev=None, cache=None, **opts): |
|
3077 | def perfrevlogrevision(ui, repo, file_, rev=None, cache=None, **opts): | |
3078 | """Benchmark obtaining a revlog revision. |
|
3078 | """Benchmark obtaining a revlog revision. | |
3079 |
|
3079 | |||
3080 | Obtaining a revlog revision consists of roughly the following steps: |
|
3080 | Obtaining a revlog revision consists of roughly the following steps: | |
3081 |
|
3081 | |||
3082 | 1. Compute the delta chain |
|
3082 | 1. Compute the delta chain | |
3083 | 2. Slice the delta chain if applicable |
|
3083 | 2. Slice the delta chain if applicable | |
3084 | 3. Obtain the raw chunks for that delta chain |
|
3084 | 3. Obtain the raw chunks for that delta chain | |
3085 | 4. Decompress each raw chunk |
|
3085 | 4. Decompress each raw chunk | |
3086 | 5. Apply binary patches to obtain fulltext |
|
3086 | 5. Apply binary patches to obtain fulltext | |
3087 | 6. Verify hash of fulltext |
|
3087 | 6. Verify hash of fulltext | |
3088 |
|
3088 | |||
3089 | This command measures the time spent in each of these phases. |
|
3089 | This command measures the time spent in each of these phases. | |
3090 | """ |
|
3090 | """ | |
3091 | opts = _byteskwargs(opts) |
|
3091 | opts = _byteskwargs(opts) | |
3092 |
|
3092 | |||
3093 | if opts.get(b'changelog') or opts.get(b'manifest'): |
|
3093 | if opts.get(b'changelog') or opts.get(b'manifest'): | |
3094 | file_, rev = None, file_ |
|
3094 | file_, rev = None, file_ | |
3095 | elif rev is None: |
|
3095 | elif rev is None: | |
3096 | raise error.CommandError(b'perfrevlogrevision', b'invalid arguments') |
|
3096 | raise error.CommandError(b'perfrevlogrevision', b'invalid arguments') | |
3097 |
|
3097 | |||
3098 | r = cmdutil.openrevlog(repo, b'perfrevlogrevision', file_, opts) |
|
3098 | r = cmdutil.openrevlog(repo, b'perfrevlogrevision', file_, opts) | |
3099 |
|
3099 | |||
3100 | # _chunkraw was renamed to _getsegmentforrevs. |
|
3100 | # _chunkraw was renamed to _getsegmentforrevs. | |
3101 | try: |
|
3101 | try: | |
3102 | segmentforrevs = r._getsegmentforrevs |
|
3102 | segmentforrevs = r._getsegmentforrevs | |
3103 | except AttributeError: |
|
3103 | except AttributeError: | |
3104 | segmentforrevs = r._chunkraw |
|
3104 | segmentforrevs = r._chunkraw | |
3105 |
|
3105 | |||
3106 | node = r.lookup(rev) |
|
3106 | node = r.lookup(rev) | |
3107 | rev = r.rev(node) |
|
3107 | rev = r.rev(node) | |
3108 |
|
3108 | |||
3109 | def getrawchunks(data, chain): |
|
3109 | def getrawchunks(data, chain): | |
3110 | start = r.start |
|
3110 | start = r.start | |
3111 | length = r.length |
|
3111 | length = r.length | |
3112 | inline = r._inline |
|
3112 | inline = r._inline | |
3113 | iosize = r._io.size |
|
3113 | iosize = r._io.size | |
3114 | buffer = util.buffer |
|
3114 | buffer = util.buffer | |
3115 |
|
3115 | |||
3116 | chunks = [] |
|
3116 | chunks = [] | |
3117 | ladd = chunks.append |
|
3117 | ladd = chunks.append | |
3118 | for idx, item in enumerate(chain): |
|
3118 | for idx, item in enumerate(chain): | |
3119 | offset = start(item[0]) |
|
3119 | offset = start(item[0]) | |
3120 | bits = data[idx] |
|
3120 | bits = data[idx] | |
3121 | for rev in item: |
|
3121 | for rev in item: | |
3122 | chunkstart = start(rev) |
|
3122 | chunkstart = start(rev) | |
3123 | if inline: |
|
3123 | if inline: | |
3124 | chunkstart += (rev + 1) * iosize |
|
3124 | chunkstart += (rev + 1) * iosize | |
3125 | chunklength = length(rev) |
|
3125 | chunklength = length(rev) | |
3126 | ladd(buffer(bits, chunkstart - offset, chunklength)) |
|
3126 | ladd(buffer(bits, chunkstart - offset, chunklength)) | |
3127 |
|
3127 | |||
3128 | return chunks |
|
3128 | return chunks | |
3129 |
|
3129 | |||
3130 | def dodeltachain(rev): |
|
3130 | def dodeltachain(rev): | |
3131 | if not cache: |
|
3131 | if not cache: | |
3132 | r.clearcaches() |
|
3132 | r.clearcaches() | |
3133 | r._deltachain(rev) |
|
3133 | r._deltachain(rev) | |
3134 |
|
3134 | |||
3135 | def doread(chain): |
|
3135 | def doread(chain): | |
3136 | if not cache: |
|
3136 | if not cache: | |
3137 | r.clearcaches() |
|
3137 | r.clearcaches() | |
3138 | for item in slicedchain: |
|
3138 | for item in slicedchain: | |
3139 | segmentforrevs(item[0], item[-1]) |
|
3139 | segmentforrevs(item[0], item[-1]) | |
3140 |
|
3140 | |||
3141 | def doslice(r, chain, size): |
|
3141 | def doslice(r, chain, size): | |
3142 | for s in slicechunk(r, chain, targetsize=size): |
|
3142 | for s in slicechunk(r, chain, targetsize=size): | |
3143 | pass |
|
3143 | pass | |
3144 |
|
3144 | |||
3145 | def dorawchunks(data, chain): |
|
3145 | def dorawchunks(data, chain): | |
3146 | if not cache: |
|
3146 | if not cache: | |
3147 | r.clearcaches() |
|
3147 | r.clearcaches() | |
3148 | getrawchunks(data, chain) |
|
3148 | getrawchunks(data, chain) | |
3149 |
|
3149 | |||
3150 | def dodecompress(chunks): |
|
3150 | def dodecompress(chunks): | |
3151 | decomp = r.decompress |
|
3151 | decomp = r.decompress | |
3152 | for chunk in chunks: |
|
3152 | for chunk in chunks: | |
3153 | decomp(chunk) |
|
3153 | decomp(chunk) | |
3154 |
|
3154 | |||
3155 | def dopatch(text, bins): |
|
3155 | def dopatch(text, bins): | |
3156 | if not cache: |
|
3156 | if not cache: | |
3157 | r.clearcaches() |
|
3157 | r.clearcaches() | |
3158 | mdiff.patches(text, bins) |
|
3158 | mdiff.patches(text, bins) | |
3159 |
|
3159 | |||
3160 | def dohash(text): |
|
3160 | def dohash(text): | |
3161 | if not cache: |
|
3161 | if not cache: | |
3162 | r.clearcaches() |
|
3162 | r.clearcaches() | |
3163 | r.checkhash(text, node, rev=rev) |
|
3163 | r.checkhash(text, node, rev=rev) | |
3164 |
|
3164 | |||
3165 | def dorevision(): |
|
3165 | def dorevision(): | |
3166 | if not cache: |
|
3166 | if not cache: | |
3167 | r.clearcaches() |
|
3167 | r.clearcaches() | |
3168 | r.revision(node) |
|
3168 | r.revision(node) | |
3169 |
|
3169 | |||
3170 | try: |
|
3170 | try: | |
3171 | from mercurial.revlogutils.deltas import slicechunk |
|
3171 | from mercurial.revlogutils.deltas import slicechunk | |
3172 | except ImportError: |
|
3172 | except ImportError: | |
3173 | slicechunk = getattr(revlog, '_slicechunk', None) |
|
3173 | slicechunk = getattr(revlog, '_slicechunk', None) | |
3174 |
|
3174 | |||
3175 | size = r.length(rev) |
|
3175 | size = r.length(rev) | |
3176 | chain = r._deltachain(rev)[0] |
|
3176 | chain = r._deltachain(rev)[0] | |
3177 | if not getattr(r, '_withsparseread', False): |
|
3177 | if not getattr(r, '_withsparseread', False): | |
3178 | slicedchain = (chain,) |
|
3178 | slicedchain = (chain,) | |
3179 | else: |
|
3179 | else: | |
3180 | slicedchain = tuple(slicechunk(r, chain, targetsize=size)) |
|
3180 | slicedchain = tuple(slicechunk(r, chain, targetsize=size)) | |
3181 | data = [segmentforrevs(seg[0], seg[-1])[1] for seg in slicedchain] |
|
3181 | data = [segmentforrevs(seg[0], seg[-1])[1] for seg in slicedchain] | |
3182 | rawchunks = getrawchunks(data, slicedchain) |
|
3182 | rawchunks = getrawchunks(data, slicedchain) | |
3183 | bins = r._chunks(chain) |
|
3183 | bins = r._chunks(chain) | |
3184 | text = bytes(bins[0]) |
|
3184 | text = bytes(bins[0]) | |
3185 | bins = bins[1:] |
|
3185 | bins = bins[1:] | |
3186 | text = mdiff.patches(text, bins) |
|
3186 | text = mdiff.patches(text, bins) | |
3187 |
|
3187 | |||
3188 | benches = [ |
|
3188 | benches = [ | |
3189 | (lambda: dorevision(), b'full'), |
|
3189 | (lambda: dorevision(), b'full'), | |
3190 | (lambda: dodeltachain(rev), b'deltachain'), |
|
3190 | (lambda: dodeltachain(rev), b'deltachain'), | |
3191 | (lambda: doread(chain), b'read'), |
|
3191 | (lambda: doread(chain), b'read'), | |
3192 | ] |
|
3192 | ] | |
3193 |
|
3193 | |||
3194 | if getattr(r, '_withsparseread', False): |
|
3194 | if getattr(r, '_withsparseread', False): | |
3195 | slicing = (lambda: doslice(r, chain, size), b'slice-sparse-chain') |
|
3195 | slicing = (lambda: doslice(r, chain, size), b'slice-sparse-chain') | |
3196 | benches.append(slicing) |
|
3196 | benches.append(slicing) | |
3197 |
|
3197 | |||
3198 | benches.extend( |
|
3198 | benches.extend( | |
3199 | [ |
|
3199 | [ | |
3200 | (lambda: dorawchunks(data, slicedchain), b'rawchunks'), |
|
3200 | (lambda: dorawchunks(data, slicedchain), b'rawchunks'), | |
3201 | (lambda: dodecompress(rawchunks), b'decompress'), |
|
3201 | (lambda: dodecompress(rawchunks), b'decompress'), | |
3202 | (lambda: dopatch(text, bins), b'patch'), |
|
3202 | (lambda: dopatch(text, bins), b'patch'), | |
3203 | (lambda: dohash(text), b'hash'), |
|
3203 | (lambda: dohash(text), b'hash'), | |
3204 | ] |
|
3204 | ] | |
3205 | ) |
|
3205 | ) | |
3206 |
|
3206 | |||
3207 | timer, fm = gettimer(ui, opts) |
|
3207 | timer, fm = gettimer(ui, opts) | |
3208 | for fn, title in benches: |
|
3208 | for fn, title in benches: | |
3209 | timer(fn, title=title) |
|
3209 | timer(fn, title=title) | |
3210 | fm.end() |
|
3210 | fm.end() | |
3211 |
|
3211 | |||
3212 |
|
3212 | |||
3213 | @command( |
|
3213 | @command( | |
3214 | b'perfrevset', |
|
3214 | b'perfrevset', | |
3215 | [ |
|
3215 | [ | |
3216 | (b'C', b'clear', False, b'clear volatile cache between each call.'), |
|
3216 | (b'C', b'clear', False, b'clear volatile cache between each call.'), | |
3217 | (b'', b'contexts', False, b'obtain changectx for each revision'), |
|
3217 | (b'', b'contexts', False, b'obtain changectx for each revision'), | |
3218 | ] |
|
3218 | ] | |
3219 | + formatteropts, |
|
3219 | + formatteropts, | |
3220 | b"REVSET", |
|
3220 | b"REVSET", | |
3221 | ) |
|
3221 | ) | |
3222 | def perfrevset(ui, repo, expr, clear=False, contexts=False, **opts): |
|
3222 | def perfrevset(ui, repo, expr, clear=False, contexts=False, **opts): | |
3223 | """benchmark the execution time of a revset |
|
3223 | """benchmark the execution time of a revset | |
3224 |
|
3224 | |||
3225 | Use the --clean option if need to evaluate the impact of build volatile |
|
3225 | Use the --clean option if need to evaluate the impact of build volatile | |
3226 | revisions set cache on the revset execution. Volatile cache hold filtered |
|
3226 | revisions set cache on the revset execution. Volatile cache hold filtered | |
3227 | and obsolete related cache.""" |
|
3227 | and obsolete related cache.""" | |
3228 | opts = _byteskwargs(opts) |
|
3228 | opts = _byteskwargs(opts) | |
3229 |
|
3229 | |||
3230 | timer, fm = gettimer(ui, opts) |
|
3230 | timer, fm = gettimer(ui, opts) | |
3231 |
|
3231 | |||
3232 | def d(): |
|
3232 | def d(): | |
3233 | if clear: |
|
3233 | if clear: | |
3234 | repo.invalidatevolatilesets() |
|
3234 | repo.invalidatevolatilesets() | |
3235 | if contexts: |
|
3235 | if contexts: | |
3236 | for ctx in repo.set(expr): |
|
3236 | for ctx in repo.set(expr): | |
3237 | pass |
|
3237 | pass | |
3238 | else: |
|
3238 | else: | |
3239 | for r in repo.revs(expr): |
|
3239 | for r in repo.revs(expr): | |
3240 | pass |
|
3240 | pass | |
3241 |
|
3241 | |||
3242 | timer(d) |
|
3242 | timer(d) | |
3243 | fm.end() |
|
3243 | fm.end() | |
3244 |
|
3244 | |||
3245 |
|
3245 | |||
3246 | @command( |
|
3246 | @command( | |
3247 | b'perfvolatilesets', |
|
3247 | b'perfvolatilesets', | |
3248 | [(b'', b'clear-obsstore', False, b'drop obsstore between each call.'),] |
|
3248 | [(b'', b'clear-obsstore', False, b'drop obsstore between each call.'),] | |
3249 | + formatteropts, |
|
3249 | + formatteropts, | |
3250 | ) |
|
3250 | ) | |
3251 | def perfvolatilesets(ui, repo, *names, **opts): |
|
3251 | def perfvolatilesets(ui, repo, *names, **opts): | |
3252 | """benchmark the computation of various volatile set |
|
3252 | """benchmark the computation of various volatile set | |
3253 |
|
3253 | |||
3254 | Volatile set computes element related to filtering and obsolescence.""" |
|
3254 | Volatile set computes element related to filtering and obsolescence.""" | |
3255 | opts = _byteskwargs(opts) |
|
3255 | opts = _byteskwargs(opts) | |
3256 | timer, fm = gettimer(ui, opts) |
|
3256 | timer, fm = gettimer(ui, opts) | |
3257 | repo = repo.unfiltered() |
|
3257 | repo = repo.unfiltered() | |
3258 |
|
3258 | |||
3259 | def getobs(name): |
|
3259 | def getobs(name): | |
3260 | def d(): |
|
3260 | def d(): | |
3261 | repo.invalidatevolatilesets() |
|
3261 | repo.invalidatevolatilesets() | |
3262 | if opts[b'clear_obsstore']: |
|
3262 | if opts[b'clear_obsstore']: | |
3263 | clearfilecache(repo, b'obsstore') |
|
3263 | clearfilecache(repo, b'obsstore') | |
3264 | obsolete.getrevs(repo, name) |
|
3264 | obsolete.getrevs(repo, name) | |
3265 |
|
3265 | |||
3266 | return d |
|
3266 | return d | |
3267 |
|
3267 | |||
3268 | allobs = sorted(obsolete.cachefuncs) |
|
3268 | allobs = sorted(obsolete.cachefuncs) | |
3269 | if names: |
|
3269 | if names: | |
3270 | allobs = [n for n in allobs if n in names] |
|
3270 | allobs = [n for n in allobs if n in names] | |
3271 |
|
3271 | |||
3272 | for name in allobs: |
|
3272 | for name in allobs: | |
3273 | timer(getobs(name), title=name) |
|
3273 | timer(getobs(name), title=name) | |
3274 |
|
3274 | |||
3275 | def getfiltered(name): |
|
3275 | def getfiltered(name): | |
3276 | def d(): |
|
3276 | def d(): | |
3277 | repo.invalidatevolatilesets() |
|
3277 | repo.invalidatevolatilesets() | |
3278 | if opts[b'clear_obsstore']: |
|
3278 | if opts[b'clear_obsstore']: | |
3279 | clearfilecache(repo, b'obsstore') |
|
3279 | clearfilecache(repo, b'obsstore') | |
3280 | repoview.filterrevs(repo, name) |
|
3280 | repoview.filterrevs(repo, name) | |
3281 |
|
3281 | |||
3282 | return d |
|
3282 | return d | |
3283 |
|
3283 | |||
3284 | allfilter = sorted(repoview.filtertable) |
|
3284 | allfilter = sorted(repoview.filtertable) | |
3285 | if names: |
|
3285 | if names: | |
3286 | allfilter = [n for n in allfilter if n in names] |
|
3286 | allfilter = [n for n in allfilter if n in names] | |
3287 |
|
3287 | |||
3288 | for name in allfilter: |
|
3288 | for name in allfilter: | |
3289 | timer(getfiltered(name), title=name) |
|
3289 | timer(getfiltered(name), title=name) | |
3290 | fm.end() |
|
3290 | fm.end() | |
3291 |
|
3291 | |||
3292 |
|
3292 | |||
3293 | @command( |
|
3293 | @command( | |
3294 | b'perfbranchmap', |
|
3294 | b'perfbranchmap', | |
3295 | [ |
|
3295 | [ | |
3296 | (b'f', b'full', False, b'Includes build time of subset'), |
|
3296 | (b'f', b'full', False, b'Includes build time of subset'), | |
3297 | ( |
|
3297 | ( | |
3298 | b'', |
|
3298 | b'', | |
3299 | b'clear-revbranch', |
|
3299 | b'clear-revbranch', | |
3300 | False, |
|
3300 | False, | |
3301 | b'purge the revbranch cache between computation', |
|
3301 | b'purge the revbranch cache between computation', | |
3302 | ), |
|
3302 | ), | |
3303 | ] |
|
3303 | ] | |
3304 | + formatteropts, |
|
3304 | + formatteropts, | |
3305 | ) |
|
3305 | ) | |
3306 | def perfbranchmap(ui, repo, *filternames, **opts): |
|
3306 | def perfbranchmap(ui, repo, *filternames, **opts): | |
3307 | """benchmark the update of a branchmap |
|
3307 | """benchmark the update of a branchmap | |
3308 |
|
3308 | |||
3309 | This benchmarks the full repo.branchmap() call with read and write disabled |
|
3309 | This benchmarks the full repo.branchmap() call with read and write disabled | |
3310 | """ |
|
3310 | """ | |
3311 | opts = _byteskwargs(opts) |
|
3311 | opts = _byteskwargs(opts) | |
3312 | full = opts.get(b"full", False) |
|
3312 | full = opts.get(b"full", False) | |
3313 | clear_revbranch = opts.get(b"clear_revbranch", False) |
|
3313 | clear_revbranch = opts.get(b"clear_revbranch", False) | |
3314 | timer, fm = gettimer(ui, opts) |
|
3314 | timer, fm = gettimer(ui, opts) | |
3315 |
|
3315 | |||
3316 | def getbranchmap(filtername): |
|
3316 | def getbranchmap(filtername): | |
3317 | """generate a benchmark function for the filtername""" |
|
3317 | """generate a benchmark function for the filtername""" | |
3318 | if filtername is None: |
|
3318 | if filtername is None: | |
3319 | view = repo |
|
3319 | view = repo | |
3320 | else: |
|
3320 | else: | |
3321 | view = repo.filtered(filtername) |
|
3321 | view = repo.filtered(filtername) | |
3322 | if util.safehasattr(view._branchcaches, '_per_filter'): |
|
3322 | if util.safehasattr(view._branchcaches, '_per_filter'): | |
3323 | filtered = view._branchcaches._per_filter |
|
3323 | filtered = view._branchcaches._per_filter | |
3324 | else: |
|
3324 | else: | |
3325 | # older versions |
|
3325 | # older versions | |
3326 | filtered = view._branchcaches |
|
3326 | filtered = view._branchcaches | |
3327 |
|
3327 | |||
3328 | def d(): |
|
3328 | def d(): | |
3329 | if clear_revbranch: |
|
3329 | if clear_revbranch: | |
3330 | repo.revbranchcache()._clear() |
|
3330 | repo.revbranchcache()._clear() | |
3331 | if full: |
|
3331 | if full: | |
3332 | view._branchcaches.clear() |
|
3332 | view._branchcaches.clear() | |
3333 | else: |
|
3333 | else: | |
3334 | filtered.pop(filtername, None) |
|
3334 | filtered.pop(filtername, None) | |
3335 | view.branchmap() |
|
3335 | view.branchmap() | |
3336 |
|
3336 | |||
3337 | return d |
|
3337 | return d | |
3338 |
|
3338 | |||
3339 | # add filter in smaller subset to bigger subset |
|
3339 | # add filter in smaller subset to bigger subset | |
3340 | possiblefilters = set(repoview.filtertable) |
|
3340 | possiblefilters = set(repoview.filtertable) | |
3341 | if filternames: |
|
3341 | if filternames: | |
3342 | possiblefilters &= set(filternames) |
|
3342 | possiblefilters &= set(filternames) | |
3343 | subsettable = getbranchmapsubsettable() |
|
3343 | subsettable = getbranchmapsubsettable() | |
3344 | allfilters = [] |
|
3344 | allfilters = [] | |
3345 | while possiblefilters: |
|
3345 | while possiblefilters: | |
3346 | for name in possiblefilters: |
|
3346 | for name in possiblefilters: | |
3347 | subset = subsettable.get(name) |
|
3347 | subset = subsettable.get(name) | |
3348 | if subset not in possiblefilters: |
|
3348 | if subset not in possiblefilters: | |
3349 | break |
|
3349 | break | |
3350 | else: |
|
3350 | else: | |
3351 | assert False, b'subset cycle %s!' % possiblefilters |
|
3351 | assert False, b'subset cycle %s!' % possiblefilters | |
3352 | allfilters.append(name) |
|
3352 | allfilters.append(name) | |
3353 | possiblefilters.remove(name) |
|
3353 | possiblefilters.remove(name) | |
3354 |
|
3354 | |||
3355 | # warm the cache |
|
3355 | # warm the cache | |
3356 | if not full: |
|
3356 | if not full: | |
3357 | for name in allfilters: |
|
3357 | for name in allfilters: | |
3358 | repo.filtered(name).branchmap() |
|
3358 | repo.filtered(name).branchmap() | |
3359 | if not filternames or b'unfiltered' in filternames: |
|
3359 | if not filternames or b'unfiltered' in filternames: | |
3360 | # add unfiltered |
|
3360 | # add unfiltered | |
3361 | allfilters.append(None) |
|
3361 | allfilters.append(None) | |
3362 |
|
3362 | |||
3363 | if util.safehasattr(branchmap.branchcache, 'fromfile'): |
|
3363 | if util.safehasattr(branchmap.branchcache, 'fromfile'): | |
3364 | branchcacheread = safeattrsetter(branchmap.branchcache, b'fromfile') |
|
3364 | branchcacheread = safeattrsetter(branchmap.branchcache, b'fromfile') | |
3365 | branchcacheread.set(classmethod(lambda *args: None)) |
|
3365 | branchcacheread.set(classmethod(lambda *args: None)) | |
3366 | else: |
|
3366 | else: | |
3367 | # older versions |
|
3367 | # older versions | |
3368 | branchcacheread = safeattrsetter(branchmap, b'read') |
|
3368 | branchcacheread = safeattrsetter(branchmap, b'read') | |
3369 | branchcacheread.set(lambda *args: None) |
|
3369 | branchcacheread.set(lambda *args: None) | |
3370 | branchcachewrite = safeattrsetter(branchmap.branchcache, b'write') |
|
3370 | branchcachewrite = safeattrsetter(branchmap.branchcache, b'write') | |
3371 | branchcachewrite.set(lambda *args: None) |
|
3371 | branchcachewrite.set(lambda *args: None) | |
3372 | try: |
|
3372 | try: | |
3373 | for name in allfilters: |
|
3373 | for name in allfilters: | |
3374 | printname = name |
|
3374 | printname = name | |
3375 | if name is None: |
|
3375 | if name is None: | |
3376 | printname = b'unfiltered' |
|
3376 | printname = b'unfiltered' | |
3377 | timer(getbranchmap(name), title=str(printname)) |
|
3377 | timer(getbranchmap(name), title=str(printname)) | |
3378 | finally: |
|
3378 | finally: | |
3379 | branchcacheread.restore() |
|
3379 | branchcacheread.restore() | |
3380 | branchcachewrite.restore() |
|
3380 | branchcachewrite.restore() | |
3381 | fm.end() |
|
3381 | fm.end() | |
3382 |
|
3382 | |||
3383 |
|
3383 | |||
3384 | @command( |
|
3384 | @command( | |
3385 | b'perfbranchmapupdate', |
|
3385 | b'perfbranchmapupdate', | |
3386 | [ |
|
3386 | [ | |
3387 | (b'', b'base', [], b'subset of revision to start from'), |
|
3387 | (b'', b'base', [], b'subset of revision to start from'), | |
3388 | (b'', b'target', [], b'subset of revision to end with'), |
|
3388 | (b'', b'target', [], b'subset of revision to end with'), | |
3389 | (b'', b'clear-caches', False, b'clear cache between each runs'), |
|
3389 | (b'', b'clear-caches', False, b'clear cache between each runs'), | |
3390 | ] |
|
3390 | ] | |
3391 | + formatteropts, |
|
3391 | + formatteropts, | |
3392 | ) |
|
3392 | ) | |
3393 | def perfbranchmapupdate(ui, repo, base=(), target=(), **opts): |
|
3393 | def perfbranchmapupdate(ui, repo, base=(), target=(), **opts): | |
3394 | """benchmark branchmap update from for <base> revs to <target> revs |
|
3394 | """benchmark branchmap update from for <base> revs to <target> revs | |
3395 |
|
3395 | |||
3396 | If `--clear-caches` is passed, the following items will be reset before |
|
3396 | If `--clear-caches` is passed, the following items will be reset before | |
3397 | each update: |
|
3397 | each update: | |
3398 | * the changelog instance and associated indexes |
|
3398 | * the changelog instance and associated indexes | |
3399 | * the rev-branch-cache instance |
|
3399 | * the rev-branch-cache instance | |
3400 |
|
3400 | |||
3401 | Examples: |
|
3401 | Examples: | |
3402 |
|
3402 | |||
3403 | # update for the one last revision |
|
3403 | # update for the one last revision | |
3404 | $ hg perfbranchmapupdate --base 'not tip' --target 'tip' |
|
3404 | $ hg perfbranchmapupdate --base 'not tip' --target 'tip' | |
3405 |
|
3405 | |||
3406 | $ update for change coming with a new branch |
|
3406 | $ update for change coming with a new branch | |
3407 | $ hg perfbranchmapupdate --base 'stable' --target 'default' |
|
3407 | $ hg perfbranchmapupdate --base 'stable' --target 'default' | |
3408 | """ |
|
3408 | """ | |
3409 | from mercurial import branchmap |
|
3409 | from mercurial import branchmap | |
3410 | from mercurial import repoview |
|
3410 | from mercurial import repoview | |
3411 |
|
3411 | |||
3412 | opts = _byteskwargs(opts) |
|
3412 | opts = _byteskwargs(opts) | |
3413 | timer, fm = gettimer(ui, opts) |
|
3413 | timer, fm = gettimer(ui, opts) | |
3414 | clearcaches = opts[b'clear_caches'] |
|
3414 | clearcaches = opts[b'clear_caches'] | |
3415 | unfi = repo.unfiltered() |
|
3415 | unfi = repo.unfiltered() | |
3416 | x = [None] # used to pass data between closure |
|
3416 | x = [None] # used to pass data between closure | |
3417 |
|
3417 | |||
3418 | # we use a `list` here to avoid possible side effect from smartset |
|
3418 | # we use a `list` here to avoid possible side effect from smartset | |
3419 | baserevs = list(scmutil.revrange(repo, base)) |
|
3419 | baserevs = list(scmutil.revrange(repo, base)) | |
3420 | targetrevs = list(scmutil.revrange(repo, target)) |
|
3420 | targetrevs = list(scmutil.revrange(repo, target)) | |
3421 | if not baserevs: |
|
3421 | if not baserevs: | |
3422 | raise error.Abort(b'no revisions selected for --base') |
|
3422 | raise error.Abort(b'no revisions selected for --base') | |
3423 | if not targetrevs: |
|
3423 | if not targetrevs: | |
3424 | raise error.Abort(b'no revisions selected for --target') |
|
3424 | raise error.Abort(b'no revisions selected for --target') | |
3425 |
|
3425 | |||
3426 | # make sure the target branchmap also contains the one in the base |
|
3426 | # make sure the target branchmap also contains the one in the base | |
3427 | targetrevs = list(set(baserevs) | set(targetrevs)) |
|
3427 | targetrevs = list(set(baserevs) | set(targetrevs)) | |
3428 | targetrevs.sort() |
|
3428 | targetrevs.sort() | |
3429 |
|
3429 | |||
3430 | cl = repo.changelog |
|
3430 | cl = repo.changelog | |
3431 | allbaserevs = list(cl.ancestors(baserevs, inclusive=True)) |
|
3431 | allbaserevs = list(cl.ancestors(baserevs, inclusive=True)) | |
3432 | allbaserevs.sort() |
|
3432 | allbaserevs.sort() | |
3433 | alltargetrevs = frozenset(cl.ancestors(targetrevs, inclusive=True)) |
|
3433 | alltargetrevs = frozenset(cl.ancestors(targetrevs, inclusive=True)) | |
3434 |
|
3434 | |||
3435 | newrevs = list(alltargetrevs.difference(allbaserevs)) |
|
3435 | newrevs = list(alltargetrevs.difference(allbaserevs)) | |
3436 | newrevs.sort() |
|
3436 | newrevs.sort() | |
3437 |
|
3437 | |||
3438 | allrevs = frozenset(unfi.changelog.revs()) |
|
3438 | allrevs = frozenset(unfi.changelog.revs()) | |
3439 | basefilterrevs = frozenset(allrevs.difference(allbaserevs)) |
|
3439 | basefilterrevs = frozenset(allrevs.difference(allbaserevs)) | |
3440 | targetfilterrevs = frozenset(allrevs.difference(alltargetrevs)) |
|
3440 | targetfilterrevs = frozenset(allrevs.difference(alltargetrevs)) | |
3441 |
|
3441 | |||
3442 | def basefilter(repo, visibilityexceptions=None): |
|
3442 | def basefilter(repo, visibilityexceptions=None): | |
3443 | return basefilterrevs |
|
3443 | return basefilterrevs | |
3444 |
|
3444 | |||
3445 | def targetfilter(repo, visibilityexceptions=None): |
|
3445 | def targetfilter(repo, visibilityexceptions=None): | |
3446 | return targetfilterrevs |
|
3446 | return targetfilterrevs | |
3447 |
|
3447 | |||
3448 | msg = b'benchmark of branchmap with %d revisions with %d new ones\n' |
|
3448 | msg = b'benchmark of branchmap with %d revisions with %d new ones\n' | |
3449 | ui.status(msg % (len(allbaserevs), len(newrevs))) |
|
3449 | ui.status(msg % (len(allbaserevs), len(newrevs))) | |
3450 | if targetfilterrevs: |
|
3450 | if targetfilterrevs: | |
3451 | msg = b'(%d revisions still filtered)\n' |
|
3451 | msg = b'(%d revisions still filtered)\n' | |
3452 | ui.status(msg % len(targetfilterrevs)) |
|
3452 | ui.status(msg % len(targetfilterrevs)) | |
3453 |
|
3453 | |||
3454 | try: |
|
3454 | try: | |
3455 | repoview.filtertable[b'__perf_branchmap_update_base'] = basefilter |
|
3455 | repoview.filtertable[b'__perf_branchmap_update_base'] = basefilter | |
3456 | repoview.filtertable[b'__perf_branchmap_update_target'] = targetfilter |
|
3456 | repoview.filtertable[b'__perf_branchmap_update_target'] = targetfilter | |
3457 |
|
3457 | |||
3458 | baserepo = repo.filtered(b'__perf_branchmap_update_base') |
|
3458 | baserepo = repo.filtered(b'__perf_branchmap_update_base') | |
3459 | targetrepo = repo.filtered(b'__perf_branchmap_update_target') |
|
3459 | targetrepo = repo.filtered(b'__perf_branchmap_update_target') | |
3460 |
|
3460 | |||
3461 | # try to find an existing branchmap to reuse |
|
3461 | # try to find an existing branchmap to reuse | |
3462 | subsettable = getbranchmapsubsettable() |
|
3462 | subsettable = getbranchmapsubsettable() | |
3463 | candidatefilter = subsettable.get(None) |
|
3463 | candidatefilter = subsettable.get(None) | |
3464 | while candidatefilter is not None: |
|
3464 | while candidatefilter is not None: | |
3465 | candidatebm = repo.filtered(candidatefilter).branchmap() |
|
3465 | candidatebm = repo.filtered(candidatefilter).branchmap() | |
3466 | if candidatebm.validfor(baserepo): |
|
3466 | if candidatebm.validfor(baserepo): | |
3467 | filtered = repoview.filterrevs(repo, candidatefilter) |
|
3467 | filtered = repoview.filterrevs(repo, candidatefilter) | |
3468 | missing = [r for r in allbaserevs if r in filtered] |
|
3468 | missing = [r for r in allbaserevs if r in filtered] | |
3469 | base = candidatebm.copy() |
|
3469 | base = candidatebm.copy() | |
3470 | base.update(baserepo, missing) |
|
3470 | base.update(baserepo, missing) | |
3471 | break |
|
3471 | break | |
3472 | candidatefilter = subsettable.get(candidatefilter) |
|
3472 | candidatefilter = subsettable.get(candidatefilter) | |
3473 | else: |
|
3473 | else: | |
3474 | # no suitable subset where found |
|
3474 | # no suitable subset where found | |
3475 | base = branchmap.branchcache() |
|
3475 | base = branchmap.branchcache() | |
3476 | base.update(baserepo, allbaserevs) |
|
3476 | base.update(baserepo, allbaserevs) | |
3477 |
|
3477 | |||
3478 | def setup(): |
|
3478 | def setup(): | |
3479 | x[0] = base.copy() |
|
3479 | x[0] = base.copy() | |
3480 | if clearcaches: |
|
3480 | if clearcaches: | |
3481 | unfi._revbranchcache = None |
|
3481 | unfi._revbranchcache = None | |
3482 | clearchangelog(repo) |
|
3482 | clearchangelog(repo) | |
3483 |
|
3483 | |||
3484 | def bench(): |
|
3484 | def bench(): | |
3485 | x[0].update(targetrepo, newrevs) |
|
3485 | x[0].update(targetrepo, newrevs) | |
3486 |
|
3486 | |||
3487 | timer(bench, setup=setup) |
|
3487 | timer(bench, setup=setup) | |
3488 | fm.end() |
|
3488 | fm.end() | |
3489 | finally: |
|
3489 | finally: | |
3490 | repoview.filtertable.pop(b'__perf_branchmap_update_base', None) |
|
3490 | repoview.filtertable.pop(b'__perf_branchmap_update_base', None) | |
3491 | repoview.filtertable.pop(b'__perf_branchmap_update_target', None) |
|
3491 | repoview.filtertable.pop(b'__perf_branchmap_update_target', None) | |
3492 |
|
3492 | |||
3493 |
|
3493 | |||
3494 | @command( |
|
3494 | @command( | |
3495 | b'perfbranchmapload', |
|
3495 | b'perfbranchmapload', | |
3496 | [ |
|
3496 | [ | |
3497 | (b'f', b'filter', b'', b'Specify repoview filter'), |
|
3497 | (b'f', b'filter', b'', b'Specify repoview filter'), | |
3498 | (b'', b'list', False, b'List brachmap filter caches'), |
|
3498 | (b'', b'list', False, b'List brachmap filter caches'), | |
3499 | (b'', b'clear-revlogs', False, b'refresh changelog and manifest'), |
|
3499 | (b'', b'clear-revlogs', False, b'refresh changelog and manifest'), | |
3500 | ] |
|
3500 | ] | |
3501 | + formatteropts, |
|
3501 | + formatteropts, | |
3502 | ) |
|
3502 | ) | |
3503 | def perfbranchmapload(ui, repo, filter=b'', list=False, **opts): |
|
3503 | def perfbranchmapload(ui, repo, filter=b'', list=False, **opts): | |
3504 | """benchmark reading the branchmap""" |
|
3504 | """benchmark reading the branchmap""" | |
3505 | opts = _byteskwargs(opts) |
|
3505 | opts = _byteskwargs(opts) | |
3506 | clearrevlogs = opts[b'clear_revlogs'] |
|
3506 | clearrevlogs = opts[b'clear_revlogs'] | |
3507 |
|
3507 | |||
3508 | if list: |
|
3508 | if list: | |
3509 | for name, kind, st in repo.cachevfs.readdir(stat=True): |
|
3509 | for name, kind, st in repo.cachevfs.readdir(stat=True): | |
3510 | if name.startswith(b'branch2'): |
|
3510 | if name.startswith(b'branch2'): | |
3511 | filtername = name.partition(b'-')[2] or b'unfiltered' |
|
3511 | filtername = name.partition(b'-')[2] or b'unfiltered' | |
3512 | ui.status( |
|
3512 | ui.status( | |
3513 | b'%s - %s\n' % (filtername, util.bytecount(st.st_size)) |
|
3513 | b'%s - %s\n' % (filtername, util.bytecount(st.st_size)) | |
3514 | ) |
|
3514 | ) | |
3515 | return |
|
3515 | return | |
3516 | if not filter: |
|
3516 | if not filter: | |
3517 | filter = None |
|
3517 | filter = None | |
3518 | subsettable = getbranchmapsubsettable() |
|
3518 | subsettable = getbranchmapsubsettable() | |
3519 | if filter is None: |
|
3519 | if filter is None: | |
3520 | repo = repo.unfiltered() |
|
3520 | repo = repo.unfiltered() | |
3521 | else: |
|
3521 | else: | |
3522 | repo = repoview.repoview(repo, filter) |
|
3522 | repo = repoview.repoview(repo, filter) | |
3523 |
|
3523 | |||
3524 | repo.branchmap() # make sure we have a relevant, up to date branchmap |
|
3524 | repo.branchmap() # make sure we have a relevant, up to date branchmap | |
3525 |
|
3525 | |||
3526 | try: |
|
3526 | try: | |
3527 | fromfile = branchmap.branchcache.fromfile |
|
3527 | fromfile = branchmap.branchcache.fromfile | |
3528 | except AttributeError: |
|
3528 | except AttributeError: | |
3529 | # older versions |
|
3529 | # older versions | |
3530 | fromfile = branchmap.read |
|
3530 | fromfile = branchmap.read | |
3531 |
|
3531 | |||
3532 | currentfilter = filter |
|
3532 | currentfilter = filter | |
3533 | # try once without timer, the filter may not be cached |
|
3533 | # try once without timer, the filter may not be cached | |
3534 | while fromfile(repo) is None: |
|
3534 | while fromfile(repo) is None: | |
3535 | currentfilter = subsettable.get(currentfilter) |
|
3535 | currentfilter = subsettable.get(currentfilter) | |
3536 | if currentfilter is None: |
|
3536 | if currentfilter is None: | |
3537 | raise error.Abort( |
|
3537 | raise error.Abort( | |
3538 | b'No branchmap cached for %s repo' % (filter or b'unfiltered') |
|
3538 | b'No branchmap cached for %s repo' % (filter or b'unfiltered') | |
3539 | ) |
|
3539 | ) | |
3540 | repo = repo.filtered(currentfilter) |
|
3540 | repo = repo.filtered(currentfilter) | |
3541 | timer, fm = gettimer(ui, opts) |
|
3541 | timer, fm = gettimer(ui, opts) | |
3542 |
|
3542 | |||
3543 | def setup(): |
|
3543 | def setup(): | |
3544 | if clearrevlogs: |
|
3544 | if clearrevlogs: | |
3545 | clearchangelog(repo) |
|
3545 | clearchangelog(repo) | |
3546 |
|
3546 | |||
3547 | def bench(): |
|
3547 | def bench(): | |
3548 | fromfile(repo) |
|
3548 | fromfile(repo) | |
3549 |
|
3549 | |||
3550 | timer(bench, setup=setup) |
|
3550 | timer(bench, setup=setup) | |
3551 | fm.end() |
|
3551 | fm.end() | |
3552 |
|
3552 | |||
3553 |
|
3553 | |||
3554 | @command(b'perfloadmarkers') |
|
3554 | @command(b'perfloadmarkers') | |
3555 | def perfloadmarkers(ui, repo): |
|
3555 | def perfloadmarkers(ui, repo): | |
3556 | """benchmark the time to parse the on-disk markers for a repo |
|
3556 | """benchmark the time to parse the on-disk markers for a repo | |
3557 |
|
3557 | |||
3558 | Result is the number of markers in the repo.""" |
|
3558 | Result is the number of markers in the repo.""" | |
3559 | timer, fm = gettimer(ui) |
|
3559 | timer, fm = gettimer(ui) | |
3560 | svfs = getsvfs(repo) |
|
3560 | svfs = getsvfs(repo) | |
3561 | timer(lambda: len(obsolete.obsstore(svfs))) |
|
3561 | timer(lambda: len(obsolete.obsstore(svfs))) | |
3562 | fm.end() |
|
3562 | fm.end() | |
3563 |
|
3563 | |||
3564 |
|
3564 | |||
3565 | @command( |
|
3565 | @command( | |
3566 | b'perflrucachedict', |
|
3566 | b'perflrucachedict', | |
3567 | formatteropts |
|
3567 | formatteropts | |
3568 | + [ |
|
3568 | + [ | |
3569 | (b'', b'costlimit', 0, b'maximum total cost of items in cache'), |
|
3569 | (b'', b'costlimit', 0, b'maximum total cost of items in cache'), | |
3570 | (b'', b'mincost', 0, b'smallest cost of items in cache'), |
|
3570 | (b'', b'mincost', 0, b'smallest cost of items in cache'), | |
3571 | (b'', b'maxcost', 100, b'maximum cost of items in cache'), |
|
3571 | (b'', b'maxcost', 100, b'maximum cost of items in cache'), | |
3572 | (b'', b'size', 4, b'size of cache'), |
|
3572 | (b'', b'size', 4, b'size of cache'), | |
3573 | (b'', b'gets', 10000, b'number of key lookups'), |
|
3573 | (b'', b'gets', 10000, b'number of key lookups'), | |
3574 | (b'', b'sets', 10000, b'number of key sets'), |
|
3574 | (b'', b'sets', 10000, b'number of key sets'), | |
3575 | (b'', b'mixed', 10000, b'number of mixed mode operations'), |
|
3575 | (b'', b'mixed', 10000, b'number of mixed mode operations'), | |
3576 | ( |
|
3576 | ( | |
3577 | b'', |
|
3577 | b'', | |
3578 | b'mixedgetfreq', |
|
3578 | b'mixedgetfreq', | |
3579 | 50, |
|
3579 | 50, | |
3580 | b'frequency of get vs set ops in mixed mode', |
|
3580 | b'frequency of get vs set ops in mixed mode', | |
3581 | ), |
|
3581 | ), | |
3582 | ], |
|
3582 | ], | |
3583 | norepo=True, |
|
3583 | norepo=True, | |
3584 | ) |
|
3584 | ) | |
3585 | def perflrucache( |
|
3585 | def perflrucache( | |
3586 | ui, |
|
3586 | ui, | |
3587 | mincost=0, |
|
3587 | mincost=0, | |
3588 | maxcost=100, |
|
3588 | maxcost=100, | |
3589 | costlimit=0, |
|
3589 | costlimit=0, | |
3590 | size=4, |
|
3590 | size=4, | |
3591 | gets=10000, |
|
3591 | gets=10000, | |
3592 | sets=10000, |
|
3592 | sets=10000, | |
3593 | mixed=10000, |
|
3593 | mixed=10000, | |
3594 | mixedgetfreq=50, |
|
3594 | mixedgetfreq=50, | |
3595 | **opts |
|
3595 | **opts | |
3596 | ): |
|
3596 | ): | |
3597 | opts = _byteskwargs(opts) |
|
3597 | opts = _byteskwargs(opts) | |
3598 |
|
3598 | |||
3599 | def doinit(): |
|
3599 | def doinit(): | |
3600 | for i in _xrange(10000): |
|
3600 | for i in _xrange(10000): | |
3601 | util.lrucachedict(size) |
|
3601 | util.lrucachedict(size) | |
3602 |
|
3602 | |||
3603 | costrange = list(range(mincost, maxcost + 1)) |
|
3603 | costrange = list(range(mincost, maxcost + 1)) | |
3604 |
|
3604 | |||
3605 | values = [] |
|
3605 | values = [] | |
3606 | for i in _xrange(size): |
|
3606 | for i in _xrange(size): | |
3607 | values.append(random.randint(0, _maxint)) |
|
3607 | values.append(random.randint(0, _maxint)) | |
3608 |
|
3608 | |||
3609 | # Get mode fills the cache and tests raw lookup performance with no |
|
3609 | # Get mode fills the cache and tests raw lookup performance with no | |
3610 | # eviction. |
|
3610 | # eviction. | |
3611 | getseq = [] |
|
3611 | getseq = [] | |
3612 | for i in _xrange(gets): |
|
3612 | for i in _xrange(gets): | |
3613 | getseq.append(random.choice(values)) |
|
3613 | getseq.append(random.choice(values)) | |
3614 |
|
3614 | |||
3615 | def dogets(): |
|
3615 | def dogets(): | |
3616 | d = util.lrucachedict(size) |
|
3616 | d = util.lrucachedict(size) | |
3617 | for v in values: |
|
3617 | for v in values: | |
3618 | d[v] = v |
|
3618 | d[v] = v | |
3619 | for key in getseq: |
|
3619 | for key in getseq: | |
3620 | value = d[key] |
|
3620 | value = d[key] | |
3621 | value # silence pyflakes warning |
|
3621 | value # silence pyflakes warning | |
3622 |
|
3622 | |||
3623 | def dogetscost(): |
|
3623 | def dogetscost(): | |
3624 | d = util.lrucachedict(size, maxcost=costlimit) |
|
3624 | d = util.lrucachedict(size, maxcost=costlimit) | |
3625 | for i, v in enumerate(values): |
|
3625 | for i, v in enumerate(values): | |
3626 | d.insert(v, v, cost=costs[i]) |
|
3626 | d.insert(v, v, cost=costs[i]) | |
3627 | for key in getseq: |
|
3627 | for key in getseq: | |
3628 | try: |
|
3628 | try: | |
3629 | value = d[key] |
|
3629 | value = d[key] | |
3630 | value # silence pyflakes warning |
|
3630 | value # silence pyflakes warning | |
3631 | except KeyError: |
|
3631 | except KeyError: | |
3632 | pass |
|
3632 | pass | |
3633 |
|
3633 | |||
3634 | # Set mode tests insertion speed with cache eviction. |
|
3634 | # Set mode tests insertion speed with cache eviction. | |
3635 | setseq = [] |
|
3635 | setseq = [] | |
3636 | costs = [] |
|
3636 | costs = [] | |
3637 | for i in _xrange(sets): |
|
3637 | for i in _xrange(sets): | |
3638 | setseq.append(random.randint(0, _maxint)) |
|
3638 | setseq.append(random.randint(0, _maxint)) | |
3639 | costs.append(random.choice(costrange)) |
|
3639 | costs.append(random.choice(costrange)) | |
3640 |
|
3640 | |||
3641 | def doinserts(): |
|
3641 | def doinserts(): | |
3642 | d = util.lrucachedict(size) |
|
3642 | d = util.lrucachedict(size) | |
3643 | for v in setseq: |
|
3643 | for v in setseq: | |
3644 | d.insert(v, v) |
|
3644 | d.insert(v, v) | |
3645 |
|
3645 | |||
3646 | def doinsertscost(): |
|
3646 | def doinsertscost(): | |
3647 | d = util.lrucachedict(size, maxcost=costlimit) |
|
3647 | d = util.lrucachedict(size, maxcost=costlimit) | |
3648 | for i, v in enumerate(setseq): |
|
3648 | for i, v in enumerate(setseq): | |
3649 | d.insert(v, v, cost=costs[i]) |
|
3649 | d.insert(v, v, cost=costs[i]) | |
3650 |
|
3650 | |||
3651 | def dosets(): |
|
3651 | def dosets(): | |
3652 | d = util.lrucachedict(size) |
|
3652 | d = util.lrucachedict(size) | |
3653 | for v in setseq: |
|
3653 | for v in setseq: | |
3654 | d[v] = v |
|
3654 | d[v] = v | |
3655 |
|
3655 | |||
3656 | # Mixed mode randomly performs gets and sets with eviction. |
|
3656 | # Mixed mode randomly performs gets and sets with eviction. | |
3657 | mixedops = [] |
|
3657 | mixedops = [] | |
3658 | for i in _xrange(mixed): |
|
3658 | for i in _xrange(mixed): | |
3659 | r = random.randint(0, 100) |
|
3659 | r = random.randint(0, 100) | |
3660 | if r < mixedgetfreq: |
|
3660 | if r < mixedgetfreq: | |
3661 | op = 0 |
|
3661 | op = 0 | |
3662 | else: |
|
3662 | else: | |
3663 | op = 1 |
|
3663 | op = 1 | |
3664 |
|
3664 | |||
3665 | mixedops.append( |
|
3665 | mixedops.append( | |
3666 | (op, random.randint(0, size * 2), random.choice(costrange)) |
|
3666 | (op, random.randint(0, size * 2), random.choice(costrange)) | |
3667 | ) |
|
3667 | ) | |
3668 |
|
3668 | |||
3669 | def domixed(): |
|
3669 | def domixed(): | |
3670 | d = util.lrucachedict(size) |
|
3670 | d = util.lrucachedict(size) | |
3671 |
|
3671 | |||
3672 | for op, v, cost in mixedops: |
|
3672 | for op, v, cost in mixedops: | |
3673 | if op == 0: |
|
3673 | if op == 0: | |
3674 | try: |
|
3674 | try: | |
3675 | d[v] |
|
3675 | d[v] | |
3676 | except KeyError: |
|
3676 | except KeyError: | |
3677 | pass |
|
3677 | pass | |
3678 | else: |
|
3678 | else: | |
3679 | d[v] = v |
|
3679 | d[v] = v | |
3680 |
|
3680 | |||
3681 | def domixedcost(): |
|
3681 | def domixedcost(): | |
3682 | d = util.lrucachedict(size, maxcost=costlimit) |
|
3682 | d = util.lrucachedict(size, maxcost=costlimit) | |
3683 |
|
3683 | |||
3684 | for op, v, cost in mixedops: |
|
3684 | for op, v, cost in mixedops: | |
3685 | if op == 0: |
|
3685 | if op == 0: | |
3686 | try: |
|
3686 | try: | |
3687 | d[v] |
|
3687 | d[v] | |
3688 | except KeyError: |
|
3688 | except KeyError: | |
3689 | pass |
|
3689 | pass | |
3690 | else: |
|
3690 | else: | |
3691 | d.insert(v, v, cost=cost) |
|
3691 | d.insert(v, v, cost=cost) | |
3692 |
|
3692 | |||
3693 | benches = [ |
|
3693 | benches = [ | |
3694 | (doinit, b'init'), |
|
3694 | (doinit, b'init'), | |
3695 | ] |
|
3695 | ] | |
3696 |
|
3696 | |||
3697 | if costlimit: |
|
3697 | if costlimit: | |
3698 | benches.extend( |
|
3698 | benches.extend( | |
3699 | [ |
|
3699 | [ | |
3700 | (dogetscost, b'gets w/ cost limit'), |
|
3700 | (dogetscost, b'gets w/ cost limit'), | |
3701 | (doinsertscost, b'inserts w/ cost limit'), |
|
3701 | (doinsertscost, b'inserts w/ cost limit'), | |
3702 | (domixedcost, b'mixed w/ cost limit'), |
|
3702 | (domixedcost, b'mixed w/ cost limit'), | |
3703 | ] |
|
3703 | ] | |
3704 | ) |
|
3704 | ) | |
3705 | else: |
|
3705 | else: | |
3706 | benches.extend( |
|
3706 | benches.extend( | |
3707 | [ |
|
3707 | [ | |
3708 | (dogets, b'gets'), |
|
3708 | (dogets, b'gets'), | |
3709 | (doinserts, b'inserts'), |
|
3709 | (doinserts, b'inserts'), | |
3710 | (dosets, b'sets'), |
|
3710 | (dosets, b'sets'), | |
3711 | (domixed, b'mixed'), |
|
3711 | (domixed, b'mixed'), | |
3712 | ] |
|
3712 | ] | |
3713 | ) |
|
3713 | ) | |
3714 |
|
3714 | |||
3715 | for fn, title in benches: |
|
3715 | for fn, title in benches: | |
3716 | timer, fm = gettimer(ui, opts) |
|
3716 | timer, fm = gettimer(ui, opts) | |
3717 | timer(fn, title=title) |
|
3717 | timer(fn, title=title) | |
3718 | fm.end() |
|
3718 | fm.end() | |
3719 |
|
3719 | |||
3720 |
|
3720 | |||
3721 | @command(b'perfwrite', formatteropts) |
|
3721 | @command(b'perfwrite', formatteropts) | |
3722 | def perfwrite(ui, repo, **opts): |
|
3722 | def perfwrite(ui, repo, **opts): | |
3723 | """microbenchmark ui.write |
|
3723 | """microbenchmark ui.write | |
3724 | """ |
|
3724 | """ | |
3725 | opts = _byteskwargs(opts) |
|
3725 | opts = _byteskwargs(opts) | |
3726 |
|
3726 | |||
3727 | timer, fm = gettimer(ui, opts) |
|
3727 | timer, fm = gettimer(ui, opts) | |
3728 |
|
3728 | |||
3729 | def write(): |
|
3729 | def write(): | |
3730 | for i in range(100000): |
|
3730 | for i in range(100000): | |
3731 | ui.writenoi18n(b'Testing write performance\n') |
|
3731 | ui.writenoi18n(b'Testing write performance\n') | |
3732 |
|
3732 | |||
3733 | timer(write) |
|
3733 | timer(write) | |
3734 | fm.end() |
|
3734 | fm.end() | |
3735 |
|
3735 | |||
3736 |
|
3736 | |||
3737 | def uisetup(ui): |
|
3737 | def uisetup(ui): | |
3738 | if util.safehasattr(cmdutil, b'openrevlog') and not util.safehasattr( |
|
3738 | if util.safehasattr(cmdutil, b'openrevlog') and not util.safehasattr( | |
3739 | commands, b'debugrevlogopts' |
|
3739 | commands, b'debugrevlogopts' | |
3740 | ): |
|
3740 | ): | |
3741 | # for "historical portability": |
|
3741 | # for "historical portability": | |
3742 | # In this case, Mercurial should be 1.9 (or a79fea6b3e77) - |
|
3742 | # In this case, Mercurial should be 1.9 (or a79fea6b3e77) - | |
3743 | # 3.7 (or 5606f7d0d063). Therefore, '--dir' option for |
|
3743 | # 3.7 (or 5606f7d0d063). Therefore, '--dir' option for | |
3744 | # openrevlog() should cause failure, because it has been |
|
3744 | # openrevlog() should cause failure, because it has been | |
3745 | # available since 3.5 (or 49c583ca48c4). |
|
3745 | # available since 3.5 (or 49c583ca48c4). | |
3746 | def openrevlog(orig, repo, cmd, file_, opts): |
|
3746 | def openrevlog(orig, repo, cmd, file_, opts): | |
3747 | if opts.get(b'dir') and not util.safehasattr(repo, b'dirlog'): |
|
3747 | if opts.get(b'dir') and not util.safehasattr(repo, b'dirlog'): | |
3748 | raise error.Abort( |
|
3748 | raise error.Abort( | |
3749 | b"This version doesn't support --dir option", |
|
3749 | b"This version doesn't support --dir option", | |
3750 | hint=b"use 3.5 or later", |
|
3750 | hint=b"use 3.5 or later", | |
3751 | ) |
|
3751 | ) | |
3752 | return orig(repo, cmd, file_, opts) |
|
3752 | return orig(repo, cmd, file_, opts) | |
3753 |
|
3753 | |||
3754 | extensions.wrapfunction(cmdutil, b'openrevlog', openrevlog) |
|
3754 | extensions.wrapfunction(cmdutil, b'openrevlog', openrevlog) | |
3755 |
|
3755 | |||
3756 |
|
3756 | |||
3757 | @command( |
|
3757 | @command( | |
3758 | b'perfprogress', |
|
3758 | b'perfprogress', | |
3759 | formatteropts |
|
3759 | formatteropts | |
3760 | + [ |
|
3760 | + [ | |
3761 | (b'', b'topic', b'topic', b'topic for progress messages'), |
|
3761 | (b'', b'topic', b'topic', b'topic for progress messages'), | |
3762 | (b'c', b'total', 1000000, b'total value we are progressing to'), |
|
3762 | (b'c', b'total', 1000000, b'total value we are progressing to'), | |
3763 | ], |
|
3763 | ], | |
3764 | norepo=True, |
|
3764 | norepo=True, | |
3765 | ) |
|
3765 | ) | |
3766 | def perfprogress(ui, topic=None, total=None, **opts): |
|
3766 | def perfprogress(ui, topic=None, total=None, **opts): | |
3767 | """printing of progress bars""" |
|
3767 | """printing of progress bars""" | |
3768 | opts = _byteskwargs(opts) |
|
3768 | opts = _byteskwargs(opts) | |
3769 |
|
3769 | |||
3770 | timer, fm = gettimer(ui, opts) |
|
3770 | timer, fm = gettimer(ui, opts) | |
3771 |
|
3771 | |||
3772 | def doprogress(): |
|
3772 | def doprogress(): | |
3773 | with ui.makeprogress(topic, total=total) as progress: |
|
3773 | with ui.makeprogress(topic, total=total) as progress: | |
3774 | for i in _xrange(total): |
|
3774 | for i in _xrange(total): | |
3775 | progress.increment() |
|
3775 | progress.increment() | |
3776 |
|
3776 | |||
3777 | timer(doprogress) |
|
3777 | timer(doprogress) | |
3778 | fm.end() |
|
3778 | fm.end() |
General Comments 0
You need to be logged in to leave comments.
Login now