comparison mercurial/localrepo.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 22371eabb3b1
children 02a745c20121
comparison
equal deleted inserted replaced
33648:47ea28293d30 33649:377e8ddaebef
337 self.origroot = path 337 self.origroot = path
338 # These auditor are not used by the vfs, 338 # These auditor are not used by the vfs,
339 # only used when writing this comment: basectx.match 339 # only used when writing this comment: basectx.match
340 self.auditor = pathutil.pathauditor(self.root, self._checknested) 340 self.auditor = pathutil.pathauditor(self.root, self._checknested)
341 self.nofsauditor = pathutil.pathauditor(self.root, self._checknested, 341 self.nofsauditor = pathutil.pathauditor(self.root, self._checknested,
342 realfs=False) 342 realfs=False, cached=True)
343 self.baseui = baseui 343 self.baseui = baseui
344 self.ui = baseui.copy() 344 self.ui = baseui.copy()
345 self.ui.copy = baseui.copy # prevent copying repo configuration 345 self.ui.copy = baseui.copy # prevent copying repo configuration
346 self.vfs = vfsmod.vfs(self.path) 346 self.vfs = vfsmod.vfs(self.path, cacheaudited=True)
347 if (self.ui.configbool('devel', 'all-warnings') or 347 if (self.ui.configbool('devel', 'all-warnings') or
348 self.ui.configbool('devel', 'check-locks')): 348 self.ui.configbool('devel', 'check-locks')):
349 self.vfs.audit = self._getvfsward(self.vfs.audit) 349 self.vfs.audit = self._getvfsward(self.vfs.audit)
350 # A list of callback to shape the phase if no data were found. 350 # A list of callback to shape the phase if no data were found.
351 # Callback are in the form: func(repo, roots) --> processed root. 351 # Callback are in the form: func(repo, roots) --> processed root.
424 raise error.RepoError(_('repository is using sparse feature but ' 424 raise error.RepoError(_('repository is using sparse feature but '
425 'sparse is not enabled; enable the ' 425 'sparse is not enabled; enable the '
426 '"sparse" extensions to access')) 426 '"sparse" extensions to access'))
427 427
428 self.store = store.store( 428 self.store = store.store(
429 self.requirements, self.sharedpath, vfsmod.vfs) 429 self.requirements, self.sharedpath,
430 lambda base: vfsmod.vfs(base, cacheaudited=True))
430 self.spath = self.store.path 431 self.spath = self.store.path
431 self.svfs = self.store.vfs 432 self.svfs = self.store.vfs
432 self.sjoin = self.store.join 433 self.sjoin = self.store.join
433 self.vfs.createmode = self.store.createmode 434 self.vfs.createmode = self.store.createmode
434 self.cachevfs = vfsmod.vfs(cachepath) 435 self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
435 self.cachevfs.createmode = self.store.createmode 436 self.cachevfs.createmode = self.store.createmode
436 if (self.ui.configbool('devel', 'all-warnings') or 437 if (self.ui.configbool('devel', 'all-warnings') or
437 self.ui.configbool('devel', 'check-locks')): 438 self.ui.configbool('devel', 'check-locks')):
438 if util.safehasattr(self.svfs, 'vfs'): # this is filtervfs 439 if util.safehasattr(self.svfs, 'vfs'): # this is filtervfs
439 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) 440 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)