Johannes Schindelin <johannes.schindelin@xxxxxx> writes:
> On Windows, files that are in use cannot be removed or renamed. That
> means that we have to release pack files when we are about to, say,
> repack them. Let's introduce a convenient function to close them
> pack files.
>
> While at it, we consolidate the close windows/close fd/close index
> stanza in `free_pack_by_name()` into the `close_pack()` function that
> is used by the new `close_all_packs()` function to avoid repeated code.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
This is the only one that was updated among the four and the change
looks sensible. I'd reword the end of the first paragraph of the
proposed log message, though, to replace "close them pack files"
with "close all the pack files and their idx files".
Thanks.
> cache.h | 1 +
> sha1_file.c | 23 ++++++++++++++++++++---
> 2 files changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/cache.h b/cache.h
> index 752031e..57f6a74 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -1275,6 +1275,7 @@ extern void close_pack_index(struct packed_git *);
>
> extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
> extern void close_pack_windows(struct packed_git *);
> +extern void close_all_packs(void);
> extern void unuse_pack(struct pack_window **);
> extern void free_pack_by_name(const char *);
> extern void clear_delta_base_cache(void);
> diff --git a/sha1_file.c b/sha1_file.c
> index 8c3c913..ca699d7 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -798,6 +798,25 @@ static int close_pack_fd(struct packed_git *p)
> return 1;
> }
>
> +static void close_pack(struct packed_git *p)
> +{
> + close_pack_windows(p);
> + close_pack_fd(p);
> + close_pack_index(p);
> +}
> +
> +void close_all_packs(void)
> +{
> + struct packed_git *p;
> +
> + for (p = packed_git; p; p = p->next)
> + if (p->do_not_close)
> + die("BUG! Want to close pack marked 'do-not-close'");
> + else
> + close_pack(p);
> +}
> +
> +
> /*
> * The LRU pack is the one with the oldest MRU window, preferring packs
> * with no used windows, or the oldest mtime if it has no windows allocated.
> @@ -906,9 +925,7 @@ void free_pack_by_name(const char *pack_name)
> p = *pp;
> if (strcmp(pack_name, p->pack_name) == 0) {
> clear_delta_base_cache();
> - close_pack_windows(p);
> - close_pack_fd(p);
> - close_pack_index(p);
> + close_pack(p);
> free(p->bad_object_sha1);
> *pp = p->next;
> if (last_found_pack == p)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html