sha1_file.c: add a function to release all packs
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>
Johannes Schindelin committed
Oct 6, 2015 at 15:18 UTC
38849a8116e690071c02eba0a8ef60a031a58080
2 files changed
+21
-3
cache.h
+1
@@ -1231,6 +1231,7 @@ extern void close_pack_index(struct packed_git *);
1231
1232
extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
1233
extern void close_pack_windows(struct packed_git *);
1234
+extern void close_all_packs(void);
1235
extern void unuse_pack(struct pack_window **);
1236
extern void free_pack_by_name(const char *);
1237
extern void clear_delta_base_cache(void);
sha1_file.c
+20
-3
@@ -765,6 +765,25 @@ static int close_pack_fd(struct packed_git *p)
765
return 1;
766
}
767
768
+static void close_pack(struct packed_git *p)
769
+{
770
+ close_pack_windows(p);
771
+ close_pack_fd(p);
772
+ close_pack_index(p);
773
+}
774
+
775
+void close_all_packs(void)
776
+{
777
+ struct packed_git *p;
778
+
779
+ for (p = packed_git; p; p = p->next)
780
+ if (p->do_not_close)
781
+ die("BUG! Want to close pack marked 'do-not-close'");
782
+ else
783
+ close_pack(p);
784
+}
785
+
786
+
787
/*
788
* The LRU pack is the one with the oldest MRU window, preferring packs
789
* with no used windows, or the oldest mtime if it has no windows allocated.
@@ -873,9 +892,7 @@ void free_pack_by_name(const char *pack_name)
892
p = *pp;
893
if (strcmp(pack_name, p->pack_name) == 0) {
894
clear_delta_base_cache();
876
- close_pack_windows(p);
877
- close_pack_fd(p);
878
- close_pack_index(p);
895
+ close_pack(p);
896
free(p->bad_object_sha1);
897
*pp = p->next;
898
if (last_found_pack == p)