This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2624

perf: teach perfbdiff to call blocks() and to use xdiff
ClosedPublic

Authored by indygreg on Mar 3 2018, 6:56 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHGd382344c69aa: perf: teach perfbdiff to call blocks() and to use xdiff

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.Mar 3 2018, 6:56 PM
quark accepted this revision.Mar 3 2018, 8:54 PM
quark added inline comments.Mar 4 2018, 11:45 PM
contrib/perf.py
1024–1030

Might move the assignment out of the loop:

              if xdiff:
                  f = mdiff.bdiff.xdiffblocks
              elif blocks:
                  f = mdiff.bdiff.blocks
              else:
                  f = mdiff.textdiff
def d():
   ...
   f(*pairs)
durin42 accepted this revision.Mar 7 2018, 10:48 AM
This revision is now accepted and ready to land.Mar 7 2018, 10:48 AM
Closed by commit rHGd382344c69aa: perf: teach perfbdiff to call blocks() and to use xdiff (authored by indygreg). · Explain WhyMar 7 2018, 11:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (28 lines)

Diff 6691

contrib/perf.py

s = repo.store s = repo.store
s.fncache._load() s.fncache._load()
def d(): def d():
for p in s.fncache.entries: for p in s.fncache.entries:
s.encode(p) s.encode(p)
timer(d) timer(d)
fm.end() fm.end()
def _bdiffworker(q, ready, done): def _bdiffworker(q, blocks, xdiff, ready, done):
while not done.is_set(): while not done.is_set():
pair = q.get() pair = q.get()
while pair is not None: while pair is not None:
if xdiff:
mdiff.bdiff.xdiffblocks(*pair)
elif blocks:
mdiff.bdiff.blocks(*pair)
else:
mdiff.textdiff(*pair) mdiff.textdiff(*pair)
q.task_done() q.task_done()
pair = q.get() pair = q.get()
q.task_done() # for the None one q.task_done() # for the None one
with ready: with ready:
ready.wait() ready.wait()
@command('perfbdiff', revlogopts + formatteropts + [ @command('perfbdiff', revlogopts + formatteropts + [
('', 'count', 1, 'number of revisions to test (when using --startrev)'), ('', 'count', 1, 'number of revisions to test (when using --startrev)'),
('', 'alldata', False, 'test bdiffs for all associated revisions'), ('', 'alldata', False, 'test bdiffs for all associated revisions'),
('', 'threads', 0, 'number of thread to use (disable with 0)'), ('', 'threads', 0, 'number of thread to use (disable with 0)'),
('', 'blocks', False, 'test computing diffs into blocks'),
('', 'xdiff', False, 'use xdiff algorithm'),
], ],
'-c|-m|FILE REV') '-c|-m|FILE REV')
def perfbdiff(ui, repo, file_, rev=None, count=None, threads=0, **opts): def perfbdiff(ui, repo, file_, rev=None, count=None, threads=0, **opts):
"""benchmark a bdiff between revisions """benchmark a bdiff between revisions
By default, benchmark a bdiff between its delta parent and itself. By default, benchmark a bdiff between its delta parent and itself.
With ``--count``, benchmark bdiffs between delta parents and self for N With ``--count``, benchmark bdiffs between delta parents and self for N
revisions starting at the specified revision. revisions starting at the specified revision.
With ``--alldata``, assume the requested revision is a changeset and With ``--alldata``, assume the requested revision is a changeset and
measure bdiffs for all changes related to that changeset (manifest measure bdiffs for all changes related to that changeset (manifest
and filelogs). and filelogs).
""" """
opts = pycompat.byteskwargs(opts)
if opts['xdiff'] and not opts['blocks']:
raise error.CommandError('perfbdiff', '--xdiff requires --blocks')
if opts['alldata']: if opts['alldata']:
opts['changelog'] = True opts['changelog'] = True
if opts.get('changelog') or opts.get('manifest'): if opts.get('changelog') or opts.get('manifest'):
file_, rev = None, file_ file_, rev = None, file_
elif rev is None: elif rev is None:
raise error.CommandError('perfbdiff', 'invalid arguments') raise error.CommandError('perfbdiff', 'invalid arguments')
blocks = opts['blocks']
xdiff = opts['xdiff']
textpairs = [] textpairs = []
r = cmdutil.openrevlog(repo, 'perfbdiff', file_, opts) r = cmdutil.openrevlog(repo, 'perfbdiff', file_, opts)
startrev = r.rev(r.lookup(rev)) startrev = r.rev(r.lookup(rev))
for rev in range(startrev, min(startrev + count, len(r) - 1)): for rev in range(startrev, min(startrev + count, len(r) - 1)):
if opts['alldata']: if opts['alldata']:
# Load revisions associated with changeset. # Load revisions associated with changeset.
else: else:
dp = r.deltaparent(rev) dp = r.deltaparent(rev)
textpairs.append((r.revision(dp), r.revision(rev))) textpairs.append((r.revision(dp), r.revision(rev)))
withthreads = threads > 0 withthreads = threads > 0
if not withthreads: if not withthreads:
def d(): def d():
for pair in textpairs: for pair in textpairs:
if xdiff:
mdiff.bdiff.xdiffblocks(*pair)
elif blocks:
mdiff.bdiff.blocks(*pair)
else:
mdiff.textdiff(*pair) mdiff.textdiff(*pair)
else: else:
quarkUnsubmitted
Not Done

Might move the assignment out of the loop:

              if xdiff:
                  f = mdiff.bdiff.xdiffblocks
              elif blocks:
                  f = mdiff.bdiff.blocks
              else:
                  f = mdiff.textdiff
def d():
   ...
   f(*pairs)
quark: Might move the assignment out of the loop: if xdiff: f =…
q = util.queue() q = util.queue()
for i in xrange(threads): for i in xrange(threads):
q.put(None) q.put(None)
ready = threading.Condition() ready = threading.Condition()
done = threading.Event() done = threading.Event()
for i in xrange(threads): for i in xrange(threads):
threading.Thread(target=_bdiffworker, args=(q, ready, done)).start() threading.Thread(target=_bdiffworker,
args=(q, blocks, xdiff, ready, done)).start()
q.join() q.join()
def d(): def d():
for pair in textpairs: for pair in textpairs:
q.put(pair) q.put(pair)
for i in xrange(threads): for i in xrange(threads):
q.put(None) q.put(None)
with ready: with ready:
ready.notify_all() ready.notify_all()