| Message ID | 0600503856dbccb135aaead27693b6815a774b4f.1646266835.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cruft packs | expand |
On Wed, Mar 02 2022, Taylor Blau wrote: > Now that the `.mtimes` format is defined, supplement the pack-write API > to be able to conditionally write an `.mtimes` file along with a pack by > setting an additional flag and passing an oidmap that contains the > timestamps corresponding to each object in the pack. > [...] > void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought) > diff --git a/pack.h b/pack.h > index fd27cfdfd7..01d385903a 100644 > --- a/pack.h > +++ b/pack.h > @@ -44,6 +44,7 @@ struct pack_idx_option { > #define WRITE_IDX_STRICT 02 > #define WRITE_REV 04 > #define WRITE_REV_VERIFY 010 > +#define WRITE_MTIMES 020 > > uint32_t version; > uint32_t off32_limit; Why the hardcoding? The 010 was added in your 8ef50d9958f (pack-write.c: prepare to write 'pack-*.rev' files, 2021-01-25). That would be the same as 8|2, but there's no 8 there., ditto this new 020 that's the same as 1<<4 | 1<<2, but there's no "16", just WRITE_REV=4.
On Thu, Mar 03, 2022 at 05:45:23PM +0100, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Mar 02 2022, Taylor Blau wrote: > > > Now that the `.mtimes` format is defined, supplement the pack-write API > > to be able to conditionally write an `.mtimes` file along with a pack by > > setting an additional flag and passing an oidmap that contains the > > timestamps corresponding to each object in the pack. > > [...] > > void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought) > > diff --git a/pack.h b/pack.h > > index fd27cfdfd7..01d385903a 100644 > > --- a/pack.h > > +++ b/pack.h > > @@ -44,6 +44,7 @@ struct pack_idx_option { > > #define WRITE_IDX_STRICT 02 > > #define WRITE_REV 04 > > #define WRITE_REV_VERIFY 010 > > +#define WRITE_MTIMES 020 > > > > uint32_t version; > > uint32_t off32_limit; > > Why the hardcoding? The 010 was added in your 8ef50d9958f (pack-write.c: > prepare to write 'pack-*.rev' files, 2021-01-25). That would be the same > as 8|2, but there's no 8 there., ditto this new 020 that's the same as > 1<<4 | 1<<2, but there's no "16", just WRITE_REV=4. I'm not sure I understand. These are octals, so octal "20" (or decimal 16) just gives us bit 5 -- the next available -- by itself. Thanks, Taylor
On Thu, Mar 03 2022, Taylor Blau wrote: > On Thu, Mar 03, 2022 at 05:45:23PM +0100, Ævar Arnfjörð Bjarmason wrote: >> >> On Wed, Mar 02 2022, Taylor Blau wrote: >> >> > Now that the `.mtimes` format is defined, supplement the pack-write API >> > to be able to conditionally write an `.mtimes` file along with a pack by >> > setting an additional flag and passing an oidmap that contains the >> > timestamps corresponding to each object in the pack. >> > [...] >> > void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought) >> > diff --git a/pack.h b/pack.h >> > index fd27cfdfd7..01d385903a 100644 >> > --- a/pack.h >> > +++ b/pack.h >> > @@ -44,6 +44,7 @@ struct pack_idx_option { >> > #define WRITE_IDX_STRICT 02 >> > #define WRITE_REV 04 >> > #define WRITE_REV_VERIFY 010 >> > +#define WRITE_MTIMES 020 >> > >> > uint32_t version; >> > uint32_t off32_limit; >> >> Why the hardcoding? The 010 was added in your 8ef50d9958f (pack-write.c: >> prepare to write 'pack-*.rev' files, 2021-01-25). That would be the same >> as 8|2, but there's no 8 there., ditto this new 020 that's the same as >> 1<<4 | 1<<2, but there's no "16", just WRITE_REV=4. > > I'm not sure I understand. These are octals, so octal "20" (or decimal > 16) just gives us bit 5 -- the next available -- by itself. Urgh, tired/rushed eyes yesterday. I managed to read these as decimals, sorry. I see from: git grep 'define[^0-9]*(\b020\b|\b16\b|1.*<<.*\b4\b)[^0-9]*$' That I managed to patch what seems to be one of two other places in the codebase using it recently (that goes >=020) in 245b9488150 (cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters), 2021-12-28). Anyway, I think nothing needs to be done here. If you ever feel like some churn here I think converting it to the almost ubiquitous "1 << N" style we use almost everywhere else would be an improvement :) Sorry!
diff --git a/pack-objects.c b/pack-objects.c index fe2a4eace9..272e8d4517 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -170,6 +170,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, if (pdata->layer) REALLOC_ARRAY(pdata->layer, pdata->nr_alloc); + + if (pdata->cruft_mtime) + REALLOC_ARRAY(pdata->cruft_mtime, pdata->nr_alloc); } new_entry = pdata->objects + pdata->nr_objects++; @@ -198,6 +201,9 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, if (pdata->layer) pdata->layer[pdata->nr_objects - 1] = 0; + if (pdata->cruft_mtime) + pdata->cruft_mtime[pdata->nr_objects - 1] = 0; + return new_entry; } diff --git a/pack-objects.h b/pack-objects.h index dca2351ef9..393b9db546 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -168,6 +168,14 @@ struct packing_data { /* delta islands */ unsigned int *tree_depth; unsigned char *layer; + + /* + * Used when writing cruft packs. + * + * Object mtimes are stored in pack order when writing, but + * written out in lexicographic (index) order. + */ + uint32_t *cruft_mtime; }; void prepare_packing_data(struct repository *r, struct packing_data *pdata); @@ -289,4 +297,21 @@ static inline void oe_set_layer(struct packing_data *pack, pack->layer[e - pack->objects] = layer; } +static inline uint32_t oe_cruft_mtime(struct packing_data *pack, + struct object_entry *e) +{ + if (!pack->cruft_mtime) + return 0; + return pack->cruft_mtime[e - pack->objects]; +} + +static inline void oe_set_cruft_mtime(struct packing_data *pack, + struct object_entry *e, + uint32_t mtime) +{ + if (!pack->cruft_mtime) + CALLOC_ARRAY(pack->cruft_mtime, pack->nr_alloc); + pack->cruft_mtime[e - pack->objects] = mtime; +} + #endif diff --git a/pack-write.c b/pack-write.c index ff305b404c..270280c4df 100644 --- a/pack-write.c +++ b/pack-write.c @@ -3,6 +3,10 @@ #include "csum-file.h" #include "remote.h" #include "chunk-format.h" +#include "pack-mtimes.h" +#include "oidmap.h" +#include "chunk-format.h" +#include "pack-objects.h" void reset_pack_idx_option(struct pack_idx_option *opts) { @@ -276,6 +280,70 @@ const char *write_rev_file_order(const char *rev_name, return rev_name; } +static void write_mtimes_header(struct hashfile *f) +{ + hashwrite_be32(f, MTIMES_SIGNATURE); + hashwrite_be32(f, MTIMES_VERSION); + hashwrite_be32(f, oid_version(the_hash_algo)); +} + +/* + * Writes the object mtimes of "objects" for use in a .mtimes file. + * Note that objects must be in lexicographic (index) order, which is + * the expected ordering of these values in the .mtimes file. + */ +static void write_mtimes_objects(struct hashfile *f, + struct packing_data *to_pack, + struct pack_idx_entry **objects, + uint32_t nr_objects) +{ + uint32_t i; + for (i = 0; i < nr_objects; i++) { + struct object_entry *e = (struct object_entry*)objects[i]; + hashwrite_be32(f, oe_cruft_mtime(to_pack, e)); + } +} + +static void write_mtimes_trailer(struct hashfile *f, const unsigned char *hash) +{ + hashwrite(f, hash, the_hash_algo->rawsz); +} + +static const char *write_mtimes_file(const char *mtimes_name, + struct packing_data *to_pack, + struct pack_idx_entry **objects, + uint32_t nr_objects, + const unsigned char *hash) +{ + struct hashfile *f; + int fd; + + if (!to_pack) + BUG("cannot call write_mtimes_file with NULL packing_data"); + + if (!mtimes_name) { + struct strbuf tmp_file = STRBUF_INIT; + fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX"); + mtimes_name = strbuf_detach(&tmp_file, NULL); + } else { + unlink(mtimes_name); + fd = xopen(mtimes_name, O_CREAT|O_EXCL|O_WRONLY, 0600); + } + f = hashfd(fd, mtimes_name); + + write_mtimes_header(f); + write_mtimes_objects(f, to_pack, objects, nr_objects); + write_mtimes_trailer(f, hash); + + if (adjust_shared_perm(mtimes_name) < 0) + die(_("failed to make %s readable"), mtimes_name); + + finalize_hashfile(f, NULL, + CSUM_HASH_IN_STREAM | CSUM_CLOSE | CSUM_FSYNC); + + return mtimes_name; +} + off_t write_pack_header(struct hashfile *f, uint32_t nr_entries) { struct pack_header hdr; @@ -478,6 +546,7 @@ void stage_tmp_packfiles(struct strbuf *name_buffer, char **idx_tmp_name) { const char *rev_tmp_name = NULL; + const char *mtimes_tmp_name = NULL; if (adjust_shared_perm(pack_tmp_name)) die_errno("unable to make temporary pack file readable"); @@ -490,9 +559,17 @@ void stage_tmp_packfiles(struct strbuf *name_buffer, rev_tmp_name = write_rev_file(NULL, written_list, nr_written, hash, pack_idx_opts->flags); + if (pack_idx_opts->flags & WRITE_MTIMES) { + mtimes_tmp_name = write_mtimes_file(NULL, to_pack, written_list, + nr_written, + hash); + } + rename_tmp_packfile(name_buffer, pack_tmp_name, "pack"); if (rev_tmp_name) rename_tmp_packfile(name_buffer, rev_tmp_name, "rev"); + if (mtimes_tmp_name) + rename_tmp_packfile(name_buffer, mtimes_tmp_name, "mtimes"); } void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought) diff --git a/pack.h b/pack.h index fd27cfdfd7..01d385903a 100644 --- a/pack.h +++ b/pack.h @@ -44,6 +44,7 @@ struct pack_idx_option { #define WRITE_IDX_STRICT 02 #define WRITE_REV 04 #define WRITE_REV_VERIFY 010 +#define WRITE_MTIMES 020 uint32_t version; uint32_t off32_limit;
Now that the `.mtimes` format is defined, supplement the pack-write API to be able to conditionally write an `.mtimes` file along with a pack by setting an additional flag and passing an oidmap that contains the timestamps corresponding to each object in the pack. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- pack-objects.c | 6 ++++ pack-objects.h | 25 ++++++++++++++++ pack-write.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ pack.h | 1 + 4 files changed, 109 insertions(+)