This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6200

perf: make perf.run-limits code work with Python 3
ClosedPublic

Authored by indygreg on Apr 4 2019, 9:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG912d82daeda3: perf: make perf.run-limits code work with Python 3
Summary

We need b'' because perf.py isn't run through the source
transformer.

We need to cast the exception to bytes using pycompat.bytestr()
because ValueError can't be %s formatted due to built-in exceptions
lacking bytes.

We need to pycompat.sysstr() before the float() and int() cast
so the ValueError message doesn't have b'' in it.

Even with that, it looks like the error message for the ValueError
for float casts added quotes, so we need to account for that in test
output.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 4 2019, 9:21 PM
pulkit accepted this revision.Apr 5 2019, 7:24 AM
Closed by commit rHG912d82daeda3: perf: make perf.run-limits code work with Python 3 (authored by indygreg). · Explain WhyApr 5 2019, 7:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (16 lines)
Mtests/test-contrib-perf.t (3 lines)

Diff 14665

contrib/perf.py

# experimental config: perf.all-timing # experimental config: perf.all-timing
displayall = ui.configbool(b"perf", b"all-timing", False) displayall = ui.configbool(b"perf", b"all-timing", False)
# experimental config: perf.run-limits # experimental config: perf.run-limits
limitspec = ui.configlist(b"perf", b"run-limits", []) limitspec = ui.configlist(b"perf", b"run-limits", [])
limits = [] limits = []
for item in limitspec: for item in limitspec:
parts = item.split('-', 1) parts = item.split(b'-', 1)
if len(parts) < 2: if len(parts) < 2:
ui.warn(('malformatted run limit entry, missing "-": %s\n' ui.warn((b'malformatted run limit entry, missing "-": %s\n'
% item)) % item))
continue continue
try: try:
time_limit = float(parts[0]) time_limit = float(pycompat.sysstr(parts[0]))
except ValueError as e: except ValueError as e:
ui.warn(('malformatted run limit entry, %s: %s\n' ui.warn((b'malformatted run limit entry, %s: %s\n'
% (e, item))) % (pycompat.bytestr(e), item)))
continue continue
try: try:
run_limit = int(parts[1]) run_limit = int(pycompat.sysstr(parts[1]))
except ValueError as e: except ValueError as e:
ui.warn(('malformatted run limit entry, %s: %s\n' ui.warn((b'malformatted run limit entry, %s: %s\n'
% (e, item))) % (pycompat.bytestr(e), item)))
continue continue
limits.append((time_limit, run_limit)) limits.append((time_limit, run_limit))
if not limits: if not limits:
limits = DEFAULTLIMITS limits = DEFAULTLIMITS
t = functools.partial(_timer, fm, displayall=displayall, limits=limits) t = functools.partial(_timer, fm, displayall=displayall, limits=limits)
return t, fm return t, fm

tests/test-contrib-perf.t

! wall * comb * user * sys * (best of 5) (glob) ! wall * comb * user * sys * (best of 5) (glob)
error case are ignored error case are ignored
$ hg perfparents --config perf.stub=no --config perf.run-limits='500, 0.000000001-5' $ hg perfparents --config perf.stub=no --config perf.run-limits='500, 0.000000001-5'
malformatted run limit entry, missing "-": 500 malformatted run limit entry, missing "-": 500
! wall * comb * user * sys * (best of 5) (glob) ! wall * comb * user * sys * (best of 5) (glob)
$ hg perfparents --config perf.stub=no --config perf.run-limits='aaa-12, 0.000000001-5' $ hg perfparents --config perf.stub=no --config perf.run-limits='aaa-12, 0.000000001-5'
malformatted run limit entry, could not convert string to float: aaa: aaa-12 malformatted run limit entry, could not convert string to float: aaa: aaa-12 (no-py3 !)
malformatted run limit entry, could not convert string to float: 'aaa': aaa-12 (py3 !)
! wall * comb * user * sys * (best of 5) (glob) ! wall * comb * user * sys * (best of 5) (glob)
$ hg perfparents --config perf.stub=no --config perf.run-limits='12-aaaaaa, 0.000000001-5' $ hg perfparents --config perf.stub=no --config perf.run-limits='12-aaaaaa, 0.000000001-5'
malformatted run limit entry, invalid literal for int() with base 10: 'aaaaaa': 12-aaaaaa malformatted run limit entry, invalid literal for int() with base 10: 'aaaaaa': 12-aaaaaa
! wall * comb * user * sys * (best of 5) (glob) ! wall * comb * user * sys * (best of 5) (glob)
test actual output test actual output
------------------ ------------------