From: Eric Wong <e@80x24.org>
To: git@vger.kernel.org
Subject: [PATCH] delta-islands: free island-related data after use
Date: Wed, 16 Nov 2022 10:50:13 +0000 [thread overview]
Message-ID: <20221116105013.1777440-1-e@80x24.org> (raw)
On my use case involving 771 islands of Linux on kernel.org,
this reduces memory usage by around 25MB. The bulk of that
comes from free_remote_islands, since free_island_regexes only
saves around 40k.
This memory is saved early in the memory-intensive pack process,
making it available for the remainder of the long process.
Signed-off-by: Eric Wong <e@80x24.org>
---
Note: I only noticed this when I screwed up up a pack.island RE,
ended up with hundreds of thousands of islands instead of 771,
and kept OOM-ing :x
Memory savings were measured using the following patch which
relies on a patched LD_PRELOAD-based malloc debugger:
https://80x24.org/spew/20221116095404.3974691-1-e@80x24.org/raw
Will try to hunt down more memory savings in the nearish future.
delta-islands.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/delta-islands.c b/delta-islands.c
index 26f9e99e1a..391e947cc6 100644
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -454,6 +454,31 @@ static void deduplicate_islands(struct repository *r)
free(list);
}
+static void free_island_regexes(void)
+{
+ unsigned int i;
+
+ for (i = 0; i < island_regexes_nr; i++)
+ regfree(&island_regexes[i]);
+
+ FREE_AND_NULL(island_regexes);
+ island_regexes_alloc = island_regexes_nr = 0;
+}
+
+static void free_remote_islands(void)
+{
+ const char *island_name;
+ struct remote_island *rl;
+
+ kh_foreach(remote_islands, island_name, rl, {
+ free((void *)island_name);
+ oid_array_clear(&rl->oids);
+ free(rl);
+ });
+ kh_destroy_str(remote_islands);
+ remote_islands = NULL;
+}
+
void load_delta_islands(struct repository *r, int progress)
{
island_marks = kh_init_oid_map();
@@ -461,7 +486,9 @@ void load_delta_islands(struct repository *r, int progress)
git_config(island_config_callback, NULL);
for_each_ref(find_island_for_ref, NULL);
+ free_island_regexes();
deduplicate_islands(r);
+ free_remote_islands();
if (progress)
fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);
next reply other threads:[~2022-11-16 11:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 10:50 Eric Wong [this message]
2022-11-16 15:44 ` [PATCH] delta-islands: free island-related data after use Ævar Arnfjörð Bjarmason
2022-11-17 23:06 ` [PATCH v2] " Eric Wong
2022-11-18 1:51 ` Ævar Arnfjörð Bjarmason
2022-11-22 20:22 ` Jeff King
2022-11-16 18:44 ` [PATCH] " Jeff King
2023-02-01 9:20 ` pack-objects memory use observations [was: [PATCH] delta-islands: free island-related data after use] Eric Wong
2023-02-01 22:09 ` Eric Wong
2023-02-02 0:11 ` Jeff King
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=20221116105013.1777440-1-e@80x24.org \
--to=e@80x24.org \
--cc=git@vger.kernel.org \
/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).