diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-11-07 02:59:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-07 04:31:28 (GMT) |
| commit | c9486eb04dd99fc00df3e68f9b908f9ad7ff9728 (patch) | |
| tree | 1604f80dc18373e70f69c3b0578c74846a0d623d /pack-check.c | |
| parent | 473935188cc9b0363b30553f23d816231a66cb44 (diff) | |
| download | git-c9486eb04dd99fc00df3e68f9b908f9ad7ff9728.zip git-c9486eb04dd99fc00df3e68f9b908f9ad7ff9728.tar.gz git-c9486eb04dd99fc00df3e68f9b908f9ad7ff9728.tar.bz2 | |
fsck: avoid reading every object twice
During verify_pack() all objects are read for SHA-1 check. Then
fsck_sha1() is called on every object, which read the object again
(fsck_sha1 -> parse_object -> read_sha1_file).
Avoid reading an object twice, do fsck_sha1 while we have an object
uncompressed data in verify_pack.
On git.git, with this patch I got:
$ /usr/bin/time ./git fsck >/dev/null
98.97user 0.90system 1:40.01elapsed 99%CPU (0avgtext+0avgdata 616624maxresident)k
0inputs+0outputs (0major+194186minor)pagefaults 0swaps
Without it:
$ /usr/bin/time ./git fsck >/dev/null
231.23user 2.35system 3:53.82elapsed 99%CPU (0avgtext+0avgdata 636688maxresident)k
0inputs+0outputs (0major+461629minor)pagefaults 0swaps
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-check.c')
| -rw-r--r-- | pack-check.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pack-check.c b/pack-check.c index 7ac9b3a..3b48b86 100644 --- a/pack-check.c +++ b/pack-check.c @@ -42,7 +42,8 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, } static int verify_packfile(struct packed_git *p, - struct pack_window **w_curs) + struct pack_window **w_curs, + verify_fn fn) { off_t index_size = p->index_size; const unsigned char *index_base = p->index_data; @@ -120,6 +121,12 @@ static int verify_packfile(struct packed_git *p, else if (check_sha1_signature(entries[i].sha1, data, size, typename(type))) err = error("packed %s from %s is corrupt", sha1_to_hex(entries[i].sha1), p->pack_name); + else if (fn) { + int eaten = 0; + fn(entries[i].sha1, type, size, data, &eaten); + if (eaten) + data = NULL; + } free(data); } free(entries); @@ -150,7 +157,7 @@ int verify_pack_index(struct packed_git *p) return err; } -int verify_pack(struct packed_git *p) +int verify_pack(struct packed_git *p, verify_fn fn) { int err = 0; struct pack_window *w_curs = NULL; @@ -159,7 +166,7 @@ int verify_pack(struct packed_git *p) if (!p->index_data) return -1; - err |= verify_packfile(p, &w_curs); + err |= verify_packfile(p, &w_curs, fn); unuse_pack(&w_curs); return err; |