Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/pathutil.py @ 33647:377e8ddaebef stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pathauditor: disable cache of audited paths by default (issue5628) The initial attempt was to discard cache when appropriate, but it appears to be error prone. We had to carefully inspect all places where audit() is called e.g. without actually updating filesystem, before removing files and directories, etc. So, this patch disables the cache of audited paths by default, and enables it only for the following cases: - short-lived auditor objects - repo.vfs, repo.svfs, and repo.cachevfs, which are managed directories and considered sort of append-only (a file/directory would never be replaced with a symlink) There would be more cacheable vfs objects (e.g. mq.queue.opener), but I decided not to inspect all of them in this patch. We can make them cached later. Benchmark result: - using old clone of http://selenic.com/repo/linux-2.6/ (38319 files) - on tmpfs - run HGRCPATH=/dev/null hg up -q --time tip && hg up -q null - try 4 times and take the last three results original: real 7.480 secs (user 1.140+22.760 sys 0.150+1.690) real 8.010 secs (user 1.070+22.280 sys 0.170+2.120) real 7.470 secs (user 1.120+22.390 sys 0.120+1.910) clearcache (the other series): real 7.680 secs (user 1.120+23.420 sys 0.140+1.970) real 7.670 secs (user 1.110+23.620 sys 0.130+1.810) real 7.740 secs (user 1.090+23.510 sys 0.160+1.940) enable cache only for vfs and svfs (this series): real 8.730 secs (user 1.500+25.190 sys 0.260+2.260) real 8.750 secs (user 1.490+25.170 sys 0.250+2.340) real 9.010 secs (user 1.680+25.340 sys 0.280+2.540) remove cache function at all (for reference): real 9.620 secs (user 1.440+27.120 sys 0.250+2.980) real 9.420 secs (user 1.400+26.940 sys 0.320+3.130) real 9.760 secs (user 1.530+27.270 sys 0.250+2.970)
author Yuya Nishihara <yuya@tcha.org>
date Wed, 26 Jul 2017 22:10:15 +0900
parents 456626e9c3d1
children 0fa781320203
comparison
equal deleted inserted replaced
33646:47ea28293d30 33647:377e8ddaebef
31 some nested repositories, e.g., subrepositories) 31 some nested repositories, e.g., subrepositories)
32 32
33 The file system checks are only done when 'realfs' is set to True (the 33 The file system checks are only done when 'realfs' is set to True (the
34 default). They should be disable then we are auditing path for operation on 34 default). They should be disable then we are auditing path for operation on
35 stored history. 35 stored history.
36
37 If 'cached' is set to True, audited paths and sub-directories are cached.
38 Be careful to not keep the cache of unmanaged directories for long because
39 audited paths may be replaced with symlinks.
36 ''' 40 '''
37 41
38 def __init__(self, root, callback=None, realfs=True): 42 def __init__(self, root, callback=None, realfs=True, cached=False):
39 self.audited = set() 43 self.audited = set()
40 self.auditeddir = set() 44 self.auditeddir = set()
41 self.root = root 45 self.root = root
42 self._realfs = realfs 46 self._realfs = realfs
47 self._cached = cached
43 self.callback = callback 48 self.callback = callback
44 if os.path.lexists(root) and not util.fscasesensitive(root): 49 if os.path.lexists(root) and not util.fscasesensitive(root):
45 self.normcase = util.normcase 50 self.normcase = util.normcase
46 else: 51 else:
47 self.normcase = lambda x: x 52 self.normcase = lambda x: x
94 continue 99 continue
95 if self._realfs: 100 if self._realfs:
96 self._checkfs(prefix, path) 101 self._checkfs(prefix, path)
97 prefixes.append(normprefix) 102 prefixes.append(normprefix)
98 103
99 self.audited.add(normpath) 104 if self._cached:
100 # only add prefixes to the cache after checking everything: we don't 105 self.audited.add(normpath)
101 # want to add "foo/bar/baz" before checking if there's a "foo/.hg" 106 # only add prefixes to the cache after checking everything: we don't
102 self.auditeddir.update(prefixes) 107 # want to add "foo/bar/baz" before checking if there's a "foo/.hg"
108 self.auditeddir.update(prefixes)
103 109
104 def _checkfs(self, prefix, path): 110 def _checkfs(self, prefix, path):
105 """raise exception if a file system backed check fails""" 111 """raise exception if a file system backed check fails"""
106 curpath = os.path.join(self.root, prefix) 112 curpath = os.path.join(self.root, prefix)
107 try: 113 try: