find_pack_entry(): do not keep packed_git pointer locally
Commit f7c22cc (always start looking up objects in the last used pack first - 2007-05-30) introduce a static packed_git* pointer as an optimization. The kept pointer however may become invalid if free_pack_by_name() happens to free that particular pack. Current code base does not access packs after calling free_pack_by_name() so it should not be a problem. Anyway, move the pointer out so that free_pack_by_name() can reset it to avoid running into troubles in future. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Feb 1, 2012 at 20:48 UTC
c01f51cc750dbd76e50919bf4e3b94e1b47d2e23
1 file changed
+13
-14
sha1_file.c
+13
-14
@@ -54,6 +54,8 @@ static struct cached_object empty_tree = {
54
0
55
};
56
57
+static struct packed_git *last_found_pack;
58
+
59
static struct cached_object *find_cached_object(const unsigned char *sha1)
60
{
61
int i;
@@ -720,6 +722,8 @@ void free_pack_by_name(const char *pack_name)
722
close_pack_index(p);
723
free(p->bad_object_sha1);
724
*pp = p->next;
725
+ if (last_found_pack == p)
726
+ last_found_pack = NULL;
727
free(p);
728
return;
729
}
@@ -2046,27 +2050,22 @@ static int fill_pack_entry(const unsigned char *sha1,
2050
2051
static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
2052
{
2049
- static struct packed_git *last_found = (void *)1;
2053
struct packed_git *p;
2054
2055
prepare_packed_git();
2056
if (!packed_git)
2057
return 0;
2055
- p = (last_found == (void *)1) ? packed_git : last_found;
2058
2057
- do {
2058
- if (fill_pack_entry(sha1, e, p)) {
2059
- last_found = p;
2060
- return 1;
2061
- }
2059
+ if (last_found_pack && fill_pack_entry(sha1, e, last_found_pack))
2060
+ return 1;
2061
2063
- if (p == last_found)
2064
- p = packed_git;
2065
- else
2066
- p = p->next;
2067
- if (p == last_found)
2068
- p = p->next;
2069
- } while (p);
2062
+ for (p = packed_git; p; p = p->next) {
2063
+ if (p == last_found_pack || !fill_pack_entry(sha1, e, p))
2064
+ continue;
2065
+
2066
+ last_found_pack = p;
2067
+ return 1;
2068
+ }
2069
return 0;
2070
}
2071