From: Karthik Nayak Date: Mon, 08 Jun 2026 15:29:04 GMT Subject: Re: [PATCH 04/16] odb/source-packed: start converting to a proper `struct odb_source` Message-ID: In-Reply-To: <20260604-pks-odb-source-packed-v1-4-2e7ab31b4b5c@pks.im> Patrick Steinhardt writes: > Start converting `struct odb_source_packed` into a proper pluggable > `struct odb_source` by embedding the base struct and assigning it the > new `ODB_SOURCE_PACKED` type. Furthermore, wire up lifecycle management > of this source by implementing the `free` callback and taking ownership > of the chdir notifications. > > Note that the packed source is not yet functional as a standalone `struct > odb_source`, as it's missing all of the callback implementations. These > will be wired up in subsequent commits. Okay, so individual commits going on will implement the callbacks. [snip] > diff --git a/odb/source-packed.c b/odb/source-packed.c > index 12e785be48..f81a990cbd 100644 > --- a/odb/source-packed.c > +++ b/odb/source-packed.c > @@ -1,11 +1,50 @@ > #include "git-compat-util.h" > +#include "abspath.h" > +#include "chdir-notify.h" > #include "odb/source-packed.h" > +#include "packfile.h" > + > +static void odb_source_packed_reparent(const char *name UNUSED, > + const char *old_cwd, > + const char *new_cwd, > + void *cb_data) > +{ > + struct odb_source_packed *packed = cb_data; > + char *path = reparent_relative_path(old_cwd, new_cwd, > + packed->base.path); > + free(packed->base.path); > + packed->base.path = path; > +} > + > +static void odb_source_packed_free(struct odb_source *source) > +{ > + struct odb_source_packed *packed = odb_source_packed_downcast(source); > + > + chdir_notify_unregister(NULL, odb_source_packed_reparent, packed); > + > + for (struct packfile_list_entry *e = packed->packs.head; e; e = e->next) > + free(e->pack); > + packfile_list_clear(&packed->packs); > + > + strmap_clear(&packed->packs_by_path, 0); > + odb_source_release(&packed->base); > + free(packed); > +} > > struct odb_source_packed *odb_source_packed_new(struct odb_source_files *parent) > { > - struct odb_source_packed *store; > - CALLOC_ARRAY(store, 1); > - store->files = parent; > - strmap_init(&store->packs_by_path); > - return store; > + struct odb_source_packed *packed; > + Nit: we could've had a better diff if we used `struct odb_source_packed *packed` from the start. But its tiny and doesn't bother me. > + CALLOC_ARRAY(packed, 1); > + odb_source_init(&packed->base, parent->base.odb, ODB_SOURCE_PACKED, > + parent->base.path, parent->base.local); > + packed->files = parent; > + strmap_init(&packed->packs_by_path); > + > + packed->base.free = odb_source_packed_free; > + > + if (!is_absolute_path(parent->base.path)) > + chdir_notify_register(NULL, odb_source_packed_reparent, packed); > + Tangent: seems like no one sets the 'name' field within `chdir_notify_register()`. It is meant for tracing purposes, but if no one is using it, we might as well remove it...? Perhaps #leftoverbits [snip]