diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-04-16 09:41:33 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-04-17 07:32:46 +0300 |
commit | e00d1a4ff7d79b403bf97a0746138d584c9ebf9a (patch) | |
tree | 53348ca6859d3344ffaca08e52e40d628c8bed90 /refs/ref-cache.c | |
parent | 7c22bc8a18744cbd79436a8ce598a0dd5d49869b (diff) |
refs: record the ref_store in ref_cache, not ref_dir
Instead of keeping a pointer to the `ref_store` in every `ref_dir`
entry, store it once in `struct ref_cache`, and change `struct
ref_dir` to include a pointer to its containing `ref_cache` instead.
This makes it easier to add to the information that is accessible from
a `ref_dir` without increasing the size of every `ref_dir` instance.
Note that previously, every `ref_dir` pointed at the containing
`files_ref_store` regardless of whether it was a part of the loose or
packed reference cache. Now we have to be sure to initialize the
instances to point at the correct containing `ref_cache`. So change
`create_dir_entry()` to take a `ref_cache` parameter, and change its
callers to pass the correct `ref_cache` depending on the purpose of
the new `dir_entry`.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs/ref-cache.c')
-rw-r--r-- | refs/ref-cache.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/refs/ref-cache.c b/refs/ref-cache.c index bf911028c80..96da094788e 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -36,7 +36,7 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry) int pos = search_ref_dir(dir, "refs/bisect/", 12); if (pos < 0) { struct ref_entry *child_entry; - child_entry = create_dir_entry(dir->ref_store, + child_entry = create_dir_entry(dir->cache, "refs/bisect/", 12, 1); add_entry_to_dir(dir, child_entry); @@ -67,7 +67,8 @@ struct ref_cache *create_ref_cache(struct files_ref_store *refs) { struct ref_cache *ret = xcalloc(1, sizeof(*ret)); - ret->root = create_dir_entry(refs, "", 0, 1); + ret->ref_store = refs; + ret->root = create_dir_entry(ret, "", 0, 1); return ret; } @@ -104,13 +105,14 @@ static void clear_ref_dir(struct ref_dir *dir) dir->entries = NULL; } -struct ref_entry *create_dir_entry(struct files_ref_store *ref_store, +struct ref_entry *create_dir_entry(struct ref_cache *cache, const char *dirname, size_t len, int incomplete) { struct ref_entry *direntry; + FLEX_ALLOC_MEM(direntry, name, dirname, len); - direntry->u.subdir.ref_store = ref_store; + direntry->u.subdir.cache = cache; direntry->flag = REF_DIR | (incomplete ? REF_INCOMPLETE : 0); return direntry; } @@ -181,7 +183,7 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir, * therefore, create an empty record for it but mark * the record complete. */ - entry = create_dir_entry(dir->ref_store, subdirname, len, 0); + entry = create_dir_entry(dir->cache, subdirname, len, 0); add_entry_to_dir(dir, entry); } else { entry = dir->entries[entry_index]; |