From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, peff@peff.net
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH v2 1/4] packfile: close and free packs upon releasing an object store
Date: Thu, 10 May 2018 12:58:46 -0700 [thread overview]
Message-ID: <20180510195849.28023-2-sbeller@google.com> (raw)
In-Reply-To: <20180510195849.28023-1-sbeller@google.com>
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 <sbeller@google.com>
---
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
next prev parent reply other threads:[~2018-05-10 19:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 19:58 [PATCH v2 0/4] Fix mem leaks of recent object store conversions Stefan Beller
2018-05-10 19:58 ` Stefan Beller [this message]
2018-05-10 19:58 ` [PATCH v2 2/4] packfile.h: remove all extern keywords Stefan Beller
2018-05-10 19:58 ` [PATCH v2 3/4] object.c: free replace map in raw_object_store_clear Stefan Beller
2018-05-10 19:58 ` [PATCH v2 4/4] replace-object.c: remove the_repository from prepare_replace_object Stefan Beller
2018-05-11 8:37 ` [PATCH v2 0/4] Fix mem leaks of recent object store conversions Jeff King
2018-05-11 18:59 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180510195849.28023-2-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).