Mercurial > hg
changeset 42837:cde1c101ab8a
py3: make statprof's chrome output work
With this patch, this command works:
python3 hg --profile --config profiling.statformat=chrome st
(and it works with s/python3/python2/ as well)
Differential Revision: https://phab.mercurial-scm.org/D6777
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 31 Aug 2019 10:26:39 -0700 |
| parents | cd3b5be5515d |
| children | f1f9ad5ae4f8 |
| files | mercurial/statprof.py |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/statprof.py Fri Aug 30 15:30:47 2019 -0700 +++ b/mercurial/statprof.py Sat Aug 31 10:26:39 2019 -0700 @@ -759,7 +759,7 @@ if path in _pathcache: return _pathcache[path] - hgpath = pycompat.fsencode(encoding.__file__).rsplit(os.sep, 2)[0] + hgpath = encoding.__file__.rsplit(os.sep, 2)[0] for p in [hgpath] + sys.path: prefix = p + os.sep if path.startswith(prefix): @@ -807,7 +807,7 @@ parent = stackid(stack[1:]) myid = len(stack2id) stack2id[stack] = myid - id2stack.append(dict(category=stack[0][0], name='%s %s' % stack[0])) + id2stack.append(dict(category=stack[0][0], name=r'%s %s' % stack[0])) if parent is not None: id2stack[-1].update(parent=parent) return myid @@ -842,7 +842,7 @@ if minthreshold <= duration <= maxthreshold: # ensure no zero-duration events sampletime = max(oldtime + clamp, sample.time) - samples.append(dict(ph='E', name=oldfunc, cat=oldcat, sf=oldsid, + samples.append(dict(ph=r'E', name=oldfunc, cat=oldcat, sf=oldsid, ts=sampletime*1e6, pid=0)) else: blacklist.add(oldidx) @@ -851,8 +851,10 @@ # events given only stack snapshots. for sample in data.samples: - stack = tuple((('%s:%d' % (simplifypath(frame.path), frame.lineno), - frame.function) for frame in sample.stack)) + stack = tuple(((r'%s:%d' % (simplifypath(pycompat.sysstr(frame.path)), + frame.lineno), + pycompat.sysstr(frame.function)) + for frame in sample.stack)) qstack = collections.deque(stack) if laststack == qstack: continue @@ -866,8 +868,8 @@ laststack.appendleft(f) path, name = f sid = stackid(tuple(laststack)) - samples.append(dict(ph='B', name=name, cat=path, ts=sample.time*1e6, - sf=sid, pid=0)) + samples.append(dict(ph=r'B', name=name, cat=path, + ts=sample.time*1e6, sf=sid, pid=0)) laststack = collections.deque(stack) while laststack: poplast()