[PATCH v2 1/4] packfile: close and free packs upon releasing an object store
From: Stefan Beller <hidden>
Date: 2018-05-10 19:59:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
In d0b59866223 (object-store: close all packs upon clearing the object
store, 2018-03-23), we made sure to close all packfiles on releasing
an object store, but we also have to free the memory of the closed packs.
Signed-off-by: Stefan Beller <redacted>
---
Notes:
> Should that INIT_LIST_HEAD get moved down into that function?
done.
> Probably the same applies to setting NULL here; you're left with a
> dangling pointer if you just call close_and_free_packs(). Should
> that helper maybe just be a static function in object.c?
I just realize that
while (o->packed_git) {
...
o->packed_git = p->next;
...
}
will make sure that o->packed_git is NULL afterwards,
hence I removed the explicit set to NULL in object.c
and we rely on the code in replace-object.c
Thanks,
Stefan
object.c | 4 +---
packfile.c | 13 +++++++++++++
packfile.h | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/object.c b/object.c
index 66cffaf6e51..242d922d953 100644
--- a/object.c
+++ b/object.c@@ -484,7 +484,5 @@ void raw_object_store_clear(struct raw_object_store *o) free_alt_odbs(o); o->alt_odb_tail = NULL; - INIT_LIST_HEAD(&o->packed_git_mru); - close_all_packs(o); - o->packed_git = NULL; + close_and_free_packs(o); }
diff --git a/packfile.c b/packfile.c
index 6c3ddc3c31d..7f2a9e28a2b 100644
--- a/packfile.c
+++ b/packfile.c@@ -322,6 +322,19 @@ void close_all_packs(struct raw_object_store *o) close_pack(p); } +void close_and_free_packs(struct raw_object_store *o) +{ + close_all_packs(o); + + INIT_LIST_HEAD(&o->packed_git_mru); + + while (o->packed_git) { + struct packed_git *p = o->packed_git; + o->packed_git = p->next; + free(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.
diff --git a/packfile.h b/packfile.h
index 9c2f8859945..cdab0557979 100644
--- a/packfile.h
+++ b/packfile.h@@ -67,6 +67,7 @@ extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t extern void close_pack_windows(struct packed_git *); extern void close_pack(struct packed_git *); extern void close_all_packs(struct raw_object_store *o); +extern void close_and_free_packs(struct raw_object_store *o); extern void unuse_pack(struct pack_window **); extern void clear_delta_base_cache(void); extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
--
2.17.0.255.g8bfb7c0704