mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref-cache: use a callback function to fill the cache

Browse Source 
It is a leveling violation for `ref_cache` to know about
`files_ref_store` or that it should call `read_loose_refs()` to lazily
fill cache directories. So instead, have its constructor take as an
argument a callback function that it should use for lazy-filling, and
change `files_ref_store` to supply a pointer to function
`read_loose_refs` (renamed to `loose_fill_ref_dir`) when creating the
ref cache for its loose refs.

This means that we can generify the type of the back-pointer in
`struct ref_cache` from `files_ref_store` to `ref_store`.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2017-04-16 08:41:34 +02:00
committed by Junio C Hamano
parent e00d1a4ff7
commit df30875987
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
refs/ref-cache.h
View File

@ -1,11 +1,27 @@
#ifndef REFS_REF_CACHE_H
#define REFS_REF_CACHE_H
struct ref_dir;
/*
* If this ref_cache is filled lazily, this function is used to load
* information into the specified ref_dir (shallow or deep, at the
* option of the ref_store). dirname includes a trailing slash.
*/
typedef void fill_ref_dir_fn(struct ref_store *ref_store,
struct ref_dir *dir, const char *dirname);
struct ref_cache {
struct ref_entry *root;
/* A pointer to the files_ref_store whose cache this is: */
struct files_ref_store *ref_store;
/* A pointer to the ref_store whose cache this is: */
struct ref_store *ref_store;
/*
* Function used (if necessary) to lazily-fill cache. May be
* NULL.
*/
fill_ref_dir_fn *fill_ref_dir;
};
/*
@ -174,9 +190,14 @@ struct ref_entry *create_ref_entry(const char *refname,
/*
* Return a pointer to a new `ref_cache`. Its top-level starts out
* marked incomplete.
* marked incomplete. If `fill_ref_dir` is non-NULL, it is the
* function called to fill in incomplete directories in the
* `ref_cache` when they are accessed. If it is NULL, then the whole
* `ref_cache` must be filled (including clearing its directories'
* `REF_INCOMPLETE` bits) before it is used.
*/
struct ref_cache *create_ref_cache(struct files_ref_store *refs);
struct ref_cache *create_ref_cache(struct ref_store *refs,
fill_ref_dir_fn *fill_ref_dir);
/*
* Free the `ref_cache` and all of its associated data.