From: Seyi Kuforiji <kuforiji98@gmail.com>
To: git@vger.kernel.org
Cc: ps@pks.im, Seyi Kufoiji <kuforiji98@gmail.com>
Subject: [PATCH v2 4/5] odb: use oidmap_clear_with_free() to release replace_map entries
Date: Mon, 2 Mar 2026 21:00:16 +0100 [thread overview]
Message-ID: <20260302200018.75731-5-kuforiji98@gmail.com> (raw)
In-Reply-To: <20260302200018.75731-1-kuforiji98@gmail.com>
From: Seyi Kufoiji <kuforiji98@gmail.com>
Replace the direct oidmap_clear() call in odb_free() with
oidmap_clear_with_free(), and introduce a free_replace_map_entry()
helper to properly free each struct replace_object stored in the map.
This centralizes cleanup logic and ensures entries are released
correctly via a dedicated callback.
Signed-off-by: Seyi Kuforiji <kuforiji98@gmail.com>
---
odb.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/odb.c b/odb.c
index 1679cc0465..8ca497203f 100644
--- a/odb.c
+++ b/odb.c
@@ -14,6 +14,7 @@
#include "object-file-convert.h"
#include "object-file.h"
#include "odb.h"
+#include "oidmap.h"
#include "packfile.h"
#include "path.h"
#include "promisor-remote.h"
@@ -1089,6 +1090,13 @@ void odb_close(struct object_database *o)
close_commit_graph(o);
}
+static void free_replace_map_entry(void *e)
+{
+ struct replace_object *entry =
+ container_of(e, struct replace_object, original);
+ free(entry);
+}
+
static void odb_free_sources(struct object_database *o)
{
while (o->sources) {
@@ -1109,7 +1117,8 @@ void odb_free(struct object_database *o)
free(o->alternate_db);
- oidmap_clear(&o->replace_map, 1);
+ if (o->replace_map_initialized)
+ oidmap_clear_with_free(&o->replace_map, free_replace_map_entry);
pthread_mutex_destroy(&o->replace_mutex);
odb_close(o);
--
2.43.0
next prev parent reply other threads:[~2026-03-02 20:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-27 23:42 [PATCH 0/5] oidmap: migrate cleanup to oidmap_clear_with_free() Seyi Kuforiji
2026-02-27 23:42 ` [PATCH 1/5] oidmap: make entry cleanup explicit in oidmap_clear Seyi Kuforiji
2026-02-27 23:42 ` [PATCH 2/5] builtin/rev-list: migrate missing_objects cleanup to oidmap_clear_with_free() Seyi Kuforiji
2026-02-28 0:09 ` Junio C Hamano
2026-02-27 23:42 ` [PATCH 3/5] list-objects-filter: use oidmap_clear_with_free() for cleanup Seyi Kuforiji
2026-02-27 23:42 ` [PATCH 4/5] odb: use oidmap_clear_with_free() to release replace_map entries Seyi Kuforiji
2026-02-27 23:42 ` [PATCH 5/5] sequencer: use oidmap_clear_with_free() for string_entry cleanup Seyi Kuforiji
2026-03-02 20:00 ` [PATCH v2 0/5] oidmap: migrate cleanup to oidmap_clear_with_free() Seyi Kuforiji
2026-03-02 20:00 ` [PATCH v2 1/5] oidmap: make entry cleanup explicit in oidmap_clear Seyi Kuforiji
2026-03-02 22:23 ` Junio C Hamano
2026-03-02 20:00 ` [PATCH v2 2/5] builtin/rev-list: migrate missing_objects cleanup to oidmap_clear_with_free() Seyi Kuforiji
2026-03-02 22:26 ` Junio C Hamano
2026-03-04 6:57 ` Patrick Steinhardt
2026-03-02 20:00 ` [PATCH v2 3/5] list-objects-filter: use oidmap_clear_with_free() for cleanup Seyi Kuforiji
2026-03-02 22:30 ` Junio C Hamano
2026-03-04 6:57 ` Patrick Steinhardt
2026-03-04 15:31 ` Junio C Hamano
2026-03-04 19:29 ` Seyi Kuforiji
2026-03-04 20:30 ` Junio C Hamano
2026-03-04 21:43 ` Junio C Hamano
2026-03-02 20:00 ` Seyi Kuforiji [this message]
2026-03-02 22:35 ` [PATCH v2 4/5] odb: use oidmap_clear_with_free() to release replace_map entries Junio C Hamano
2026-03-02 20:00 ` [PATCH v2 5/5] sequencer: use oidmap_clear_with_free() for string_entry cleanup Seyi Kuforiji
2026-03-02 22:38 ` Junio C Hamano
2026-03-04 6:57 ` Patrick Steinhardt
2026-03-05 10:05 ` [PATCH v3 0/2] oidmap: migrate cleanup to oidmap_clear_with_free() Seyi Kuforiji
2026-03-05 10:05 ` [PATCH v3 1/2] oidmap: make entry cleanup explicit in oidmap_clear Seyi Kuforiji
2026-03-05 10:05 ` [PATCH v3 2/2] builtin/rev-list: migrate missing_objects cleanup to oidmap_clear_with_free() Seyi Kuforiji
2026-03-05 14:27 ` [PATCH v3 0/2] oidmap: migrate " Patrick Steinhardt
2026-03-05 19:17 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260302200018.75731-5-kuforiji98@gmail.com \
--to=kuforiji98@gmail.com \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox