From 0e88c130f2f6309932464d4919725e54837978c7 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 13 Aug 2011 00:36:29 +0200 Subject: [PATCH] Retain caches of submodule refs Instead of keeping track of one cache for refs in the main repo and another single cache shared among submodules, keep a linked list of cached_refs objects, one for each module/submodule. Change invalidate_cached_refs() to invalidate all caches. (Previously, it only invalidated the cache of the main repo because the submodule caches were not reused anyway.) Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- refs.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/refs.c b/refs.c index 6fd351174a..2811d8e053 100644 --- a/refs.c +++ b/refs.c @@ -153,13 +153,15 @@ static struct ref_list *sort_ref_list(struct ref_list *list) * when doing a full libification. */ static struct cached_refs { + struct cached_refs *next; char did_loose; char did_packed; struct ref_list *loose; struct ref_list *packed; /* The submodule name, or "" for the main repo. */ char name[FLEX_ARRAY]; -} *cached_refs, *submodule_refs; +} *cached_refs; + static struct ref_list *current_ref; static struct ref_list *extra_refs; @@ -191,6 +193,7 @@ struct cached_refs *create_cached_refs(const char *submodule) submodule = ""; len = strlen(submodule) + 1; refs = xmalloc(sizeof(struct cached_refs) + len); + refs->next = NULL; refs->did_loose = refs->did_packed = 0; refs->loose = refs->packed = NULL; memcpy(refs->name, submodule, len); @@ -205,23 +208,28 @@ struct cached_refs *create_cached_refs(const char *submodule) */ static struct cached_refs *get_cached_refs(const char *submodule) { - if (!submodule) { - if (!cached_refs) - cached_refs = create_cached_refs(submodule); - return cached_refs; - } else { - if (!submodule_refs) - submodule_refs = create_cached_refs(submodule); - else - /* For now, don't reuse the refs cache for submodules. */ - clear_cached_refs(submodule_refs); - return submodule_refs; + struct cached_refs *refs = cached_refs; + if (!submodule) + submodule = ""; + while (refs) { + if (!strcmp(submodule, refs->name)) + return refs; + refs = refs->next; } + + refs = create_cached_refs(submodule); + refs->next = cached_refs; + cached_refs = refs; + return refs; } static void invalidate_cached_refs(void) { - clear_cached_refs(get_cached_refs(NULL)); + struct cached_refs *refs = cached_refs; + while (refs) { + clear_cached_refs(refs); + refs = refs->next; + } } static struct ref_list *read_packed_refs(FILE *f) -- 2.11.4.GIT