1616.1.2
by Martin Pool
Emit trace message about hash cache performance. |
1 |
# Copyright (C) 2005, 2006 by Canonical Ltd
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
2 |
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
953
by Martin Pool
- refactor imports and stats for hashcache |
17 |
# TODO: Up-front, stat all files in order and remove those which are deleted or
|
18 |
# out-of-date. Don't actually re-read them until they're needed. That ought
|
|
19 |
# to bring all the inodes into core so that future stats to them are fast, and
|
|
20 |
# it preserves the nice property that any caller will always get up-to-date
|
|
21 |
# data except in unavoidable cases.
|
|
864
by Martin Pool
doc |
22 |
|
23 |
# TODO: Perhaps return more details on the file to avoid statting it
|
|
24 |
# again: nonexistent, file type, size, etc
|
|
25 |
||
1213
by Martin Pool
- move import in hashcache |
26 |
# TODO: Perhaps use a Python pickle instead of a text file; might be faster.
|
27 |
||
864
by Martin Pool
doc |
28 |
|
29 |
||
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
30 |
CACHE_HEADER = "### bzr hashcache v5\n" |
859
by Martin Pool
- add HashCache.write and a simple test for it |
31 |
|
953
by Martin Pool
- refactor imports and stats for hashcache |
32 |
import os, stat, time |
1092.2.6
by Robert Collins
symlink support updated to work |
33 |
import sha |
953
by Martin Pool
- refactor imports and stats for hashcache |
34 |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
35 |
from bzrlib.osutils import sha_file, pathjoin, safe_unicode |
953
by Martin Pool
- refactor imports and stats for hashcache |
36 |
from bzrlib.trace import mutter, warning |
1213
by Martin Pool
- move import in hashcache |
37 |
from bzrlib.atomicfile import AtomicFile |
1185.59.8
by Denys Duchier
hashcache: missing import for BzrError |
38 |
from bzrlib.errors import BzrError |
1540.1.1
by Martin Pool
[patch] stat-cache fixes from Denys |
39 |
|
40 |
||
1185.59.10
by Denys Duchier
hashcache: new constants and improved comment |
41 |
FP_MTIME_COLUMN = 1 |
42 |
FP_CTIME_COLUMN = 2 |
|
1092.2.6
by Robert Collins
symlink support updated to work |
43 |
FP_MODE_COLUMN = 5 |
859
by Martin Pool
- add HashCache.write and a simple test for it |
44 |
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
45 |
def _fingerprint(abspath): |
46 |
try: |
|
47 |
fs = os.lstat(abspath) |
|
48 |
except OSError: |
|
49 |
# might be missing, etc
|
|
50 |
return None |
|
51 |
||
52 |
if stat.S_ISDIR(fs.st_mode): |
|
53 |
return None |
|
54 |
||
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
55 |
# we discard any high precision because it's not reliable; perhaps we
|
56 |
# could do better on some systems?
|
|
57 |
return (fs.st_size, long(fs.st_mtime), |
|
1092.2.6
by Robert Collins
symlink support updated to work |
58 |
long(fs.st_ctime), fs.st_ino, fs.st_dev, fs.st_mode) |
846
by Martin Pool
- start adding refactored/simplified hash cache |
59 |
|
60 |
||
61 |
class HashCache(object): |
|
62 |
"""Cache for looking up file SHA-1.
|
|
63 |
||
64 |
Files are considered to match the cached value if the fingerprint
|
|
65 |
of the file has not changed. This includes its mtime, ctime,
|
|
66 |
device number, inode number, and size. This should catch
|
|
67 |
modifications or replacement of the file by a new one.
|
|
68 |
||
69 |
This may not catch modifications that do not change the file's
|
|
70 |
size and that occur within the resolution window of the
|
|
71 |
timestamps. To handle this we specifically do not cache files
|
|
72 |
which have changed since the start of the present second, since
|
|
73 |
they could undetectably change again.
|
|
74 |
||
75 |
This scheme may fail if the machine's clock steps backwards.
|
|
76 |
Don't do that.
|
|
77 |
||
78 |
This does not canonicalize the paths passed in; that should be
|
|
79 |
done by the caller.
|
|
80 |
||
860
by Martin Pool
- refactor hashcache to use just one dictionary |
81 |
_cache
|
82 |
Indexed by path, points to a two-tuple of the SHA-1 of the file.
|
|
83 |
and its fingerprint.
|
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
84 |
|
85 |
stat_count
|
|
86 |
number of times files have been statted
|
|
87 |
||
88 |
hit_count
|
|
89 |
number of times files have been retrieved from the cache, avoiding a
|
|
90 |
re-read
|
|
91 |
|
|
92 |
miss_count
|
|
93 |
number of misses (times files have been completely re-read)
|
|
94 |
"""
|
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
95 |
needs_write = False |
96 |
||
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
97 |
def __init__(self, root, cache_file_name, mode=None): |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
98 |
"""Create a hash cache in base dir, and set the file mode to mode."""
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
99 |
self.root = safe_unicode(root) |
846
by Martin Pool
- start adding refactored/simplified hash cache |
100 |
self.hit_count = 0 |
101 |
self.miss_count = 0 |
|
102 |
self.stat_count = 0 |
|
103 |
self.danger_count = 0 |
|
953
by Martin Pool
- refactor imports and stats for hashcache |
104 |
self.removed_count = 0 |
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
105 |
self.update_count = 0 |
860
by Martin Pool
- refactor hashcache to use just one dictionary |
106 |
self._cache = {} |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
107 |
self._mode = mode |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
108 |
self._cache_file_name = safe_unicode(cache_file_name) |
846
by Martin Pool
- start adding refactored/simplified hash cache |
109 |
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
110 |
def cache_file_name(self): |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
111 |
return self._cache_file_name |
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
112 |
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
113 |
def clear(self): |
860
by Martin Pool
- refactor hashcache to use just one dictionary |
114 |
"""Discard all cached information.
|
115 |
||
116 |
This does not reset the counters."""
|
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
117 |
if self._cache: |
118 |
self.needs_write = True |
|
119 |
self._cache = {} |
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
120 |
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
121 |
def scan(self): |
122 |
"""Scan all files and remove entries where the cache entry is obsolete.
|
|
123 |
|
|
124 |
Obsolete entries are those where the file has been modified or deleted
|
|
125 |
since the entry was inserted.
|
|
126 |
"""
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
127 |
# FIXME optimisation opportunity, on linux [and check other oses]:
|
128 |
# rather than iteritems order, stat in inode order.
|
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
129 |
prep = [(ce[1][3], path, ce) for (path, ce) in self._cache.iteritems()] |
953
by Martin Pool
- refactor imports and stats for hashcache |
130 |
prep.sort() |
131 |
||
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
132 |
for inum, path, cache_entry in prep: |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
133 |
abspath = pathjoin(self.root, path) |
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
134 |
fp = _fingerprint(abspath) |
135 |
self.stat_count += 1 |
|
136 |
||
137 |
cache_fp = cache_entry[1] |
|
138 |
||
139 |
if (not fp) or (cache_fp != fp): |
|
140 |
# not here or not a regular file anymore
|
|
141 |
self.removed_count += 1 |
|
142 |
self.needs_write = True |
|
143 |
del self._cache[path] |
|
144 |
||
953
by Martin Pool
- refactor imports and stats for hashcache |
145 |
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
146 |
def get_sha1(self, path): |
953
by Martin Pool
- refactor imports and stats for hashcache |
147 |
"""Return the sha1 of a file.
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
148 |
"""
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
149 |
abspath = pathjoin(self.root, path) |
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
150 |
self.stat_count += 1 |
151 |
file_fp = _fingerprint(abspath) |
|
152 |
||
153 |
if not file_fp: |
|
154 |
# not a regular file or not existing
|
|
155 |
if path in self._cache: |
|
156 |
self.removed_count += 1 |
|
157 |
self.needs_write = True |
|
158 |
del self._cache[path] |
|
159 |
return None |
|
953
by Martin Pool
- refactor imports and stats for hashcache |
160 |
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
161 |
if path in self._cache: |
162 |
cache_sha1, cache_fp = self._cache[path] |
|
860
by Martin Pool
- refactor hashcache to use just one dictionary |
163 |
else: |
164 |
cache_sha1, cache_fp = None, None |
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
165 |
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
166 |
if cache_fp == file_fp: |
846
by Martin Pool
- start adding refactored/simplified hash cache |
167 |
self.hit_count += 1 |
860
by Martin Pool
- refactor hashcache to use just one dictionary |
168 |
return cache_sha1 |
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
169 |
|
170 |
self.miss_count += 1 |
|
1092.2.6
by Robert Collins
symlink support updated to work |
171 |
|
172 |
||
173 |
mode = file_fp[FP_MODE_COLUMN] |
|
174 |
if stat.S_ISREG(mode): |
|
175 |
digest = sha_file(file(abspath, 'rb', buffering=65000)) |
|
176 |
elif stat.S_ISLNK(mode): |
|
177 |
digest = sha.new(os.readlink(abspath)).hexdigest() |
|
178 |
else: |
|
179 |
raise BzrError("file %r: unknown file stat mode: %o"%(abspath,mode)) |
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
180 |
|
181 |
now = int(time.time()) |
|
1185.59.10
by Denys Duchier
hashcache: new constants and improved comment |
182 |
if file_fp[FP_MTIME_COLUMN] >= now or file_fp[FP_CTIME_COLUMN] >= now: |
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
183 |
# changed too recently; can't be cached. we can
|
184 |
# return the result and it could possibly be cached
|
|
185 |
# next time.
|
|
1185.59.10
by Denys Duchier
hashcache: new constants and improved comment |
186 |
#
|
187 |
# the point is that we only want to cache when we are sure that any
|
|
188 |
# subsequent modifications of the file can be detected. If a
|
|
189 |
# modification neither changes the inode, the device, the size, nor
|
|
190 |
# the mode, then we can only distinguish it by time; therefore we
|
|
191 |
# need to let sufficient time elapse before we may cache this entry
|
|
192 |
# again. If we didn't do this, then, for example, a very quick 1
|
|
193 |
# byte replacement in the file might go undetected.
|
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
194 |
self.danger_count += 1 |
195 |
if cache_fp: |
|
196 |
self.removed_count += 1 |
|
197 |
self.needs_write = True |
|
198 |
del self._cache[path] |
|
846
by Martin Pool
- start adding refactored/simplified hash cache |
199 |
else: |
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
200 |
self.update_count += 1 |
201 |
self.needs_write = True |
|
202 |
self._cache[path] = (digest, file_fp) |
|
203 |
return digest |
|
204 |
||
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
205 |
def write(self): |
859
by Martin Pool
- add HashCache.write and a simple test for it |
206 |
"""Write contents of cache to file."""
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
207 |
outf = AtomicFile(self.cache_file_name(), 'wb', new_mode=self._mode) |
859
by Martin Pool
- add HashCache.write and a simple test for it |
208 |
try: |
862
by Martin Pool
- code to re-read hashcache from file |
209 |
print >>outf, CACHE_HEADER, |
859
by Martin Pool
- add HashCache.write and a simple test for it |
210 |
|
860
by Martin Pool
- refactor hashcache to use just one dictionary |
211 |
for path, c in self._cache.iteritems(): |
859
by Martin Pool
- add HashCache.write and a simple test for it |
212 |
assert '//' not in path, path |
213 |
outf.write(path.encode('utf-8')) |
|
214 |
outf.write('// ') |
|
860
by Martin Pool
- refactor hashcache to use just one dictionary |
215 |
print >>outf, c[0], # hex sha1 |
216 |
for fld in c[1]: |
|
862
by Martin Pool
- code to re-read hashcache from file |
217 |
print >>outf, "%d" % fld, |
859
by Martin Pool
- add HashCache.write and a simple test for it |
218 |
print >>outf |
219 |
outf.commit() |
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
220 |
self.needs_write = False |
1616.1.2
by Martin Pool
Emit trace message about hash cache performance. |
221 |
mutter("write hash cache: %s hits=%d misses=%d stat=%d recent=%d updates=%d", |
222 |
self.cache_file_name(), self.hit_count, self.miss_count, |
|
223 |
self.stat_count, |
|
224 |
self.danger_count, self.update_count) |
|
859
by Martin Pool
- add HashCache.write and a simple test for it |
225 |
finally: |
226 |
if not outf.closed: |
|
227 |
outf.abort() |
|
862
by Martin Pool
- code to re-read hashcache from file |
228 |
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
229 |
def read(self): |
862
by Martin Pool
- code to re-read hashcache from file |
230 |
"""Reinstate cache from file.
|
231 |
||
232 |
Overwrites existing cache.
|
|
233 |
||
234 |
If the cache file has the wrong version marker, this just clears
|
|
235 |
the cache."""
|
|
236 |
self._cache = {} |
|
237 |
||
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
238 |
fn = self.cache_file_name() |
239 |
try: |
|
948
by Martin Pool
- more buffering when reading/writing hashcache |
240 |
inf = file(fn, 'rb', buffering=65000) |
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
241 |
except IOError, e: |
1185.31.4
by John Arbash Meinel
Fixing mutter() calls to not have to do string processing. |
242 |
mutter("failed to open %s: %s", fn, e) |
1214
by Martin Pool
- hashcache should be written out if it can't be read |
243 |
# better write it now so it is valid
|
244 |
self.needs_write = True |
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
245 |
return
|
246 |
||
247 |
||
862
by Martin Pool
- code to re-read hashcache from file |
248 |
hdr = inf.readline() |
249 |
if hdr != CACHE_HEADER: |
|
1185.31.4
by John Arbash Meinel
Fixing mutter() calls to not have to do string processing. |
250 |
mutter('cache header marker not found at top of %s;' |
251 |
' discarding cache', fn) |
|
1214
by Martin Pool
- hashcache should be written out if it can't be read |
252 |
self.needs_write = True |
862
by Martin Pool
- code to re-read hashcache from file |
253 |
return
|
254 |
||
255 |
for l in inf: |
|
256 |
pos = l.index('// ') |
|
257 |
path = l[:pos].decode('utf-8') |
|
258 |
if path in self._cache: |
|
259 |
warning('duplicated path %r in cache' % path) |
|
260 |
continue
|
|
261 |
||
262 |
pos += 3 |
|
263 |
fields = l[pos:].split(' ') |
|
1092.2.6
by Robert Collins
symlink support updated to work |
264 |
if len(fields) != 7: |
862
by Martin Pool
- code to re-read hashcache from file |
265 |
warning("bad line in hashcache: %r" % l) |
266 |
continue
|
|
267 |
||
268 |
sha1 = fields[0] |
|
269 |
if len(sha1) != 40: |
|
270 |
warning("bad sha1 in hashcache: %r" % sha1) |
|
271 |
continue
|
|
272 |
||
273 |
fp = tuple(map(long, fields[1:])) |
|
274 |
||
275 |
self._cache[path] = (sha1, fp) |
|
276 |
||
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
277 |
self.needs_write = False |
278 |
||
279 |
||
862
by Martin Pool
- code to re-read hashcache from file |
280 |
|
281 |