##// END OF EJS Templates
parsers: inline fields of dirstate values in C version...
parsers: inline fields of dirstate values in C version Previously, while unpacking the dirstate we'd create 3-4 new CPython objects for most dirstate values: - the state is a single character string, which is pooled by CPython - the mode is a new object if it isn't 0 due to being in the lookup set - the size is a new object if it is greater than 255 - the mtime is a new object if it isn't -1 due to being in the lookup set - the tuple to contain them all In some cases such as regular hg status, we actually look at all the objects. In other cases like hg add, hg status for a subdirectory, or hg status with the third-party hgwatchman enabled, we look at almost none of the objects. This patch eliminates most object creation in these cases by defining a custom C struct that is exposed to Python with an interface similar to a tuple. Only when tuple elements are actually requested are the respective objects created. The gains, where they're expected, are significant. The following tests are run against a working copy with over 270,000 files. parse_dirstate becomes significantly faster: $ hg perfdirstate before: wall 0.186437 comb 0.180000 user 0.160000 sys 0.020000 (best of 35) after: wall 0.093158 comb 0.100000 user 0.090000 sys 0.010000 (best of 95) and as a result, several commands benefit: $ time hg status # with hgwatchman enabled before: 0.42s user 0.14s system 99% cpu 0.563 total after: 0.34s user 0.12s system 99% cpu 0.471 total $ time hg add new-file before: 0.85s user 0.18s system 99% cpu 1.033 total after: 0.76s user 0.17s system 99% cpu 0.931 total There is a slight regression in regular status performance, but this is fixed in an upcoming patch.

File last commit:

r21030:9ea132ae default
r21809:e250b830 default
Show More
tags.py
312 lines | 11.7 KiB | text/x-python | PythonLexer
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 # tags.py - read tag info from local repository
#
# Copyright 2009 Matt Mackall <mpm@selenic.com>
# Copyright 2009 Greg Ward <greg@gerg.ca>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 # Currently this module only deals with reading and caching tags.
# Eventually, it could take care of updating (adding/removing/moving)
# tags too.
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 from node import nullid, bin, hex, short
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 from i18n import _
import encoding
import error
Idan Kamara
tags: loosen IOError filtering when reading localtags
r14038 import errno
Gregory Szorc
tags: log events related to tags cache...
r21030 import time
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149
Greg Ward
tags: remove the old non-caching implementation of findglobaltags()....
r11351 def findglobaltags(ui, repo, alltags, tagtypes):
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 '''Find global tags in repo by reading .hgtags from every head that
Greg Ward
tags: remove the old non-caching implementation of findglobaltags()....
r11351 has a distinct version of it, using a cache to avoid excess work.
Updates the dicts alltags, tagtypes in place: alltags maps tag name
to (node, hist) pair (see _readtags() below), and tagtypes maps tag
name to tag type ("global" in this case).'''
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 # This is so we can be lazy and assume alltags contains only global
# tags when we pass it to _writetagcache().
assert len(alltags) == len(tagtypes) == 0, \
"findglobaltags() should be called first"
(heads, tagfnode, cachetags, shouldwrite) = _readtagcache(ui, repo)
if cachetags is not None:
assert not shouldwrite
# XXX is this really 100% correct? are there oddball special
# cases where a global tag should outrank a local tag but won't,
# because cachetags does not contain rank info?
_updatetags(cachetags, 'global', alltags, tagtypes)
return
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
seen = set() # set of fnode
fctx = None
for head in reversed(heads): # oldest to newest
assert head in repo.changelog.nodemap, \
"tag cache returned bogus head %s" % short(head)
fnode = tagfnode.get(head)
if fnode and fnode not in seen:
seen.add(fnode)
if not fctx:
fctx = repo.filectx('.hgtags', fileid=fnode)
else:
fctx = fctx.filectx(fnode)
filetags = _readtags(ui, repo, fctx.data().splitlines(), fctx)
_updatetags(filetags, 'global', alltags, tagtypes)
# and update the cache (if necessary)
if shouldwrite:
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 _writetagcache(ui, repo, heads, tagfnode, alltags)
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 def readlocaltags(ui, repo, alltags, tagtypes):
'''Read local tags in repo. Update alltags and tagtypes.'''
try:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 data = repo.opener.read("localtags")
Idan Kamara
tags: loosen IOError filtering when reading localtags
r14038 except IOError, inst:
if inst.errno != errno.ENOENT:
raise
return
# localtags is in the local encoding; re-encode to UTF-8 on
# input for consistency with the rest of this module.
filetags = _readtags(
ui, repo, data.splitlines(), "localtags",
recode=encoding.fromlocal)
_updatetags(filetags, "local", alltags, tagtypes)
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 def _readtags(ui, repo, lines, fn, recode=None):
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 '''Read tag definitions from a file (or any source of lines).
Return a mapping from tag name to (node, hist): node is the node id
from the last line read for that name, and hist is the list of node
ids previously associated with it (in file order). All node ids are
binary, not hex.'''
filetags = {} # map tag name to (node, hist)
count = 0
def warn(msg):
ui.warn(_("%s, line %s: %s\n") % (fn, count, msg))
for line in lines:
count += 1
if not line:
continue
try:
(nodehex, name) = line.split(" ", 1)
except ValueError:
warn(_("cannot parse entry"))
continue
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 name = name.strip()
if recode:
name = recode(name)
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 try:
nodebin = bin(nodehex)
except TypeError:
warn(_("node '%s' is not well formed") % nodehex)
continue
# update filetags
hist = []
if name in filetags:
n, hist = filetags[name]
hist.append(n)
filetags[name] = (nodebin, hist)
return filetags
def _updatetags(filetags, tagtype, alltags, tagtypes):
'''Incorporate the tag info read from one file into the two
dictionaries, alltags and tagtypes, that contain all tag
info (global across all heads plus local).'''
for name, nodehist in filetags.iteritems():
if name not in alltags:
alltags[name] = nodehist
tagtypes[name] = tagtype
continue
# we prefer alltags[name] if:
Mads Kiilerich
fix trivial spelling errors
r17424 # it supersedes us OR
# mutual supersedes and it has a higher rank
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 # otherwise we win because we're tip-most
anode, ahist = nodehist
bnode, bhist = alltags[name]
if (bnode != anode and anode in bhist and
(bnode not in ahist or len(bhist) > len(ahist))):
anode = bnode
FUJIWARA Katsunori
tags: update tag type only if tag node is updated (issue3911)...
r19108 else:
tagtypes[name] = tagtype
Greg Ward
Factor tags module out of localrepo (issue548)....
r9149 ahist.extend([n for n in bhist if n not in ahist])
alltags[name] = anode, ahist
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
# The tag cache only stores info about heads, not the tag contents
# from each head. I.e. it doesn't try to squeeze out the maximum
# performance, but is simpler has a better chance of actually
# working correctly. And this gives the biggest performance win: it
# avoids looking up .hgtags in the manifest for every head, and it
# can avoid calling heads() at all if there have been no changes to
# the repo.
def _readtagcache(ui, repo):
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 '''Read the tag cache and return a tuple (heads, fnodes, cachetags,
shouldwrite). If the cache is completely up-to-date, cachetags is a
dict of the form returned by _readtags(); otherwise, it is None and
heads and fnodes are set. In that case, heads is the list of all
heads currently in the repository (ordered from tip to oldest) and
fnodes is a mapping from head to .hgtags filenode. If those two are
set, caller is responsible for reading tag info from each head.'''
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
try:
Adrian Buehlmann
remove pointless os.path.join calls when opening files in .hg/cache...
r13341 cachefile = repo.opener('cache/tags', 'r')
Nicolas Dumazet
static-http: mimic more closely localrepo (issue2164: allow clone -r )...
r11066 # force reading the file for static-http
cachelines = iter(cachefile)
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 except IOError:
cachefile = None
# The cache file consists of lines like
# <headrev> <headnode> [<tagnode>]
# where <headrev> and <headnode> redundantly identify a repository
# head from the time the cache was written, and <tagnode> is the
# filenode of .hgtags on that head. Heads with no .hgtags file will
# have no <tagnode>. The cache is ordered from tip to oldest (which
# is part of why <headrev> is there: a quick visual check is all
# that's required to ensure correct order).
Dirkjan Ochtman
kill trailing whitespace
r9312 #
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 # This information is enough to let us avoid the most expensive part
# of finding global tags, which is looking up <tagnode> in the
# manifest for each head.
cacherevs = [] # list of headrev
cacheheads = [] # list of headnode
cachefnode = {} # map headnode to filenode
if cachefile:
Nicolas Dumazet
tags: do not fail if tags.cache is corrupted (issue2444)...
r12758 try:
for line in cachelines:
if line == "\n":
break
Martin Geisler
tags: line.rstrip().split() can be replaced with line.split()...
r16589 line = line.split()
Nicolas Dumazet
tags: do not fail if tags.cache is corrupted (issue2444)...
r12758 cacherevs.append(int(line[0]))
headnode = bin(line[1])
cacheheads.append(headnode)
if len(line) == 3:
fnode = bin(line[2])
cachefnode[headnode] = fnode
Matt Mackall
tags: catch more corruption during cache parsing (issue2779)
r14020 except Exception:
jfh
move tags.cache and branchheads.cache to a collected cache folder .hg/cache/...
r13272 # corruption of the tags cache, just recompute it
ui.warn(_('.hg/cache/tags is corrupt, rebuilding it\n'))
Nicolas Dumazet
tags: do not fail if tags.cache is corrupted (issue2444)...
r12758 cacheheads = []
cacherevs = []
cachefnode = {}
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
tipnode = repo.changelog.tip()
tiprev = len(repo.changelog) - 1
# Case 1 (common): tip is the same, so nothing has changed.
# (Unchanged tip trivially means no changesets have been added.
# But, thanks to localrepository.destroyed(), it also means none
# have been destroyed by strip or rollback.)
if cacheheads and cacheheads[0] == tipnode and cacherevs[0] == tiprev:
Nicolas Dumazet
static-http: mimic more closely localrepo (issue2164: allow clone -r )...
r11066 tags = _readtags(ui, repo, cachelines, cachefile.name)
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 cachefile.close()
return (None, None, tags, False)
if cachefile:
cachefile.close() # ignore rest of file
Dirkjan Ochtman
kill trailing whitespace
r9312
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 repoheads = repo.heads()
# Case 2 (uncommon): empty repo; get out quickly and don't bother
# writing an empty cache.
if repoheads == [nullid]:
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 return ([], {}, {}, False)
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
# Case 3 (uncommon): cache file missing or empty.
# Case 4 (uncommon): tip rev decreased. This should only happen
# when we're called from localrepository.destroyed(). Refresh the
# cache so future invocations will not see disappeared heads in the
# cache.
# Case 5 (common): tip has changed, so we've added/replaced heads.
Greg Ward
tags: remove inactive debugging code....
r11352 # As it happens, the code to handle cases 3, 4, 5 is the same.
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
# N.B. in case 4 (nodes destroyed), "new head" really means "newly
# exposed".
Bryan O'Sullivan
tags: short-circuit if no tags have ever been committed
r16730 if not len(repo.file('.hgtags')):
# No tags have ever been committed, so we can avoid a
# potentially expensive search.
return (repoheads, cachefnode, None, True)
Gregory Szorc
tags: log events related to tags cache...
r21030 starttime = time.time()
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 newheads = [head
for head in repoheads
if head not in set(cacheheads)]
# Now we have to lookup the .hgtags filenode for every new head.
# This is the most expensive part of finding tags, so performance
# depends primarily on the size of newheads. Worst case: no cache
# file, so newheads == repoheads.
Matt Mackall
tags: visit new heads in forward order when rebuilding cache...
r17256 for head in reversed(newheads):
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 cctx = repo[head]
try:
fnode = cctx.filenode('.hgtags')
cachefnode[head] = fnode
except error.LookupError:
# no .hgtags file on this head
pass
Gregory Szorc
tags: log events related to tags cache...
r21030 duration = time.time() - starttime
ui.log('tagscache',
'resolved %d tags cache entries from %d manifests in %0.4f '
'seconds\n',
len(cachefnode), len(newheads), duration)
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 # Caller has to iterate over all heads, but can use the filenodes in
# cachefnode to get to each .hgtags revision quickly.
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 return (repoheads, cachefnode, None, True)
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 def _writetagcache(ui, repo, heads, tagfnode, cachetags):
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
Greg Ward
tags: don't crash if unable to write tag cache...
r9366 try:
Adrian Buehlmann
remove pointless os.path.join calls when opening files in .hg/cache...
r13341 cachefile = repo.opener('cache/tags', 'w', atomictemp=True)
Greg Ward
tags: don't crash if unable to write tag cache...
r9366 except (OSError, IOError):
return
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151
Gregory Szorc
tags: log events related to tags cache...
r21030 ui.log('tagscache', 'writing tags cache file with %d heads and %d tags\n',
len(heads), len(cachetags))
Greg Ward
tags: implement persistent tag caching (issue548)....
r9151 realheads = repo.heads() # for sanity checks below
for head in heads:
# temporary sanity checks; these can probably be removed
# once this code has been in crew for a few weeks
assert head in repo.changelog.nodemap, \
'trying to write non-existent node %s to tag cache' % short(head)
assert head in realheads, \
'trying to write non-head %s to tag cache' % short(head)
assert head != nullid, \
'trying to write nullid to tag cache'
# This can't fail because of the first assert above. When/if we
# remove that assert, we might want to catch LookupError here
# and downgrade it to a warning.
rev = repo.changelog.rev(head)
fnode = tagfnode.get(head)
if fnode:
cachefile.write('%d %s %s\n' % (rev, hex(head), hex(fnode)))
else:
cachefile.write('%d %s\n' % (rev, hex(head)))
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 # Tag names in the cache are in UTF-8 -- which is the whole reason
# we keep them in UTF-8 throughout this module. If we converted
# them local encoding on input, we would lose info writing them to
# the cache.
cachefile.write('\n')
for (name, (node, hist)) in cachetags.iteritems():
FUJIWARA Katsunori
tags: write tag overwriting history also into tag cache file (issue3911)...
r19646 for n in hist:
cachefile.write("%s %s\n" % (hex(n), name))
Greg Ward
tags: support 'instant' tag retrieval (issue548)...
r9152 cachefile.write("%s %s\n" % (hex(node), name))
Steve Borho
tags: don't allow environment errors to be raised from _writetagscache...
r14662 try:
Greg Ward
atomictempfile: make close() consistent with other file-like objects....
r15057 cachefile.close()
Steve Borho
tags: don't allow environment errors to be raised from _writetagscache...
r14662 except (OSError, IOError):
pass