diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-10-10 02:08:51 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 14:09:30 (GMT) |
| commit | 838cd34664422863096f1a089f779bed1f00edf6 (patch) | |
| tree | be36986d2f3b6e64e0770f4fc5045b3390cfeec9 /csum-file.h | |
| parent | 44c33a5b9603fba7c9556512a72e4e392ba4ae2d (diff) | |
| download | git-838cd34664422863096f1a089f779bed1f00edf6.zip git-838cd34664422863096f1a089f779bed1f00edf6.tar.gz git-838cd34664422863096f1a089f779bed1f00edf6.tar.bz2 | |
fix pread()'s short read in index-pack
Since v1.6.0.2~13^2~ the completion of a thin pack uses sha1write() for
its ability to compute a SHA1 on the written data. This also provides
data buffering which, along with commit 92392b4a45, will confuse pread()
whenever an appended object is 1) freed due to memory pressure because
of the depth-first delta processing, and 2) needed again because it has
many delta children, and 3) its data is still buffered by sha1write().
Let's fix the issue by simply forcing cached data out when such an
object is written so it can be pread()'d at leisure.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'csum-file.h')
| -rw-r--r-- | csum-file.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/csum-file.h b/csum-file.h index 72c9487..01f13b5 100644 --- a/csum-file.h +++ b/csum-file.h @@ -24,6 +24,7 @@ extern struct sha1file *sha1fd(int fd, const char *name); extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp); extern int sha1close(struct sha1file *, unsigned char *, unsigned int); extern int sha1write(struct sha1file *, void *, unsigned int); +extern void sha1flush(struct sha1file *f); extern void crc32_begin(struct sha1file *); extern uint32_t crc32_end(struct sha1file *); |