Mercurial > hg
comparison mercurial/vfs.py @ 33649:377e8ddaebef stable
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 | d5b2beca16c0 |
comparison
equal
deleted
inserted
replaced
33648:47ea28293d30 | 33649:377e8ddaebef |
---|---|
293 class vfs(abstractvfs): | 293 class vfs(abstractvfs): |
294 '''Operate files relative to a base directory | 294 '''Operate files relative to a base directory |
295 | 295 |
296 This class is used to hide the details of COW semantics and | 296 This class is used to hide the details of COW semantics and |
297 remote file access from higher level code. | 297 remote file access from higher level code. |
298 | |
299 'cacheaudited' should be enabled only if (a) vfs object is short-lived, or | |
300 (b) the base directory is managed by hg and considered sort-of append-only. | |
301 See pathutil.pathauditor() for details. | |
298 ''' | 302 ''' |
299 def __init__(self, base, audit=True, expandpath=False, realpath=False): | 303 def __init__(self, base, audit=True, cacheaudited=False, expandpath=False, |
304 realpath=False): | |
300 if expandpath: | 305 if expandpath: |
301 base = util.expandpath(base) | 306 base = util.expandpath(base) |
302 if realpath: | 307 if realpath: |
303 base = os.path.realpath(base) | 308 base = os.path.realpath(base) |
304 self.base = base | 309 self.base = base |
305 self._audit = audit | 310 self._audit = audit |
306 if audit: | 311 if audit: |
307 self.audit = pathutil.pathauditor(self.base) | 312 self.audit = pathutil.pathauditor(self.base, cached=cacheaudited) |
308 else: | 313 else: |
309 self.audit = (lambda path, mode=None: True) | 314 self.audit = (lambda path, mode=None: True) |
310 self.createmode = None | 315 self.createmode = None |
311 self._trustnlink = None | 316 self._trustnlink = None |
312 | 317 |