Skip to content

Commit

Permalink
sha1_file.c: add a function to release all packs
Browse files Browse the repository at this point in the history
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 all the
pack files and their idx 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@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Oct 7, 2015
1 parent 71fe5d7 commit 38849a8
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
1 change: 1 addition & 0 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,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);
Expand Down
23 changes: 20 additions & 3 deletions sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,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.
Expand Down Expand Up @@ -873,9 +892,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)
Expand Down

0 comments on commit 38849a8

Please sign in to comment.