From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH 2/5] midx: inline nth_midxed_pack_entry()
Date: Sat, 11 Sep 2021 22:39:31 +0200 [thread overview]
Message-ID: <06f0f546-31c6-9cf5-5e11-999cb354c91a@web.de> (raw)
In-Reply-To: <e50c1465-59de-7fe1-de01-800404c7640e@web.de>
fill_midx_entry() finds the position of an object ID and passes it to
nth_midxed_pack_entry(), which uses the position to look up the object
ID for its own purposes. Inline the latter into the former to avoid
that lookup.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
midx.c | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/midx.c b/midx.c
index 321c6fdd2f..8cb063023c 100644
--- a/midx.c
+++ b/midx.c
@@ -276,14 +276,18 @@ uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos)
(off_t)pos * MIDX_CHUNK_OFFSET_WIDTH);
}
-static int nth_midxed_pack_entry(struct repository *r,
- struct multi_pack_index *m,
- struct pack_entry *e,
- uint32_t pos)
+int fill_midx_entry(struct repository * r,
+ const struct object_id *oid,
+ struct pack_entry *e,
+ struct multi_pack_index *m)
{
+ uint32_t pos;
uint32_t pack_int_id;
struct packed_git *p;
+ if (!bsearch_midx(oid, m, &pos))
+ return 0;
+
if (pos >= m->num_objects)
return 0;
@@ -305,10 +309,8 @@ static int nth_midxed_pack_entry(struct repository *r,
if (p->num_bad_objects) {
uint32_t i;
- struct object_id oid;
- nth_midxed_object_oid(&oid, m, pos);
for (i = 0; i < p->num_bad_objects; i++)
- if (hasheq(oid.hash,
+ if (hasheq(oid->hash,
p->bad_object_sha1 + the_hash_algo->rawsz * i))
return 0;
}
@@ -319,19 +321,6 @@ static int nth_midxed_pack_entry(struct repository *r,
return 1;
}
-int fill_midx_entry(struct repository * r,
- const struct object_id *oid,
- struct pack_entry *e,
- struct multi_pack_index *m)
-{
- uint32_t pos;
-
- if (!bsearch_midx(oid, m, &pos))
- return 0;
-
- return nth_midxed_pack_entry(r, m, e, pos);
-}
-
/* Match "foo.idx" against either "foo.pack" _or_ "foo.idx". */
static int cmp_idx_or_pack_name(const char *idx_or_pack_name,
const char *idx_name)
--
2.33.0
next prev parent reply other threads:[~2021-09-11 20:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-11 7:50 [PATCH 0/3] packfile: use oidset for bad objects René Scharfe
2021-09-11 7:59 ` [PATCH 1/3] packfile: convert mark_bad_packed_object() to object_id René Scharfe
2021-09-11 8:00 ` [PATCH 2/3] packfile: convert has_packed_and_bad() " René Scharfe
2021-09-11 8:01 ` [PATCH 3/3] packfile: use oidset for bad objects René Scharfe
2021-09-11 14:26 ` Jeff King
2021-09-11 16:08 ` René Scharfe
2021-09-11 17:03 ` Jeff King
2021-09-11 17:16 ` René Scharfe
2021-09-11 14:27 ` [PATCH 0/3] " Jeff King
2021-09-11 16:08 ` [PATCH 4/3] midx: inline nth_midxed_pack_entry() René Scharfe
2021-09-11 17:03 ` René Scharfe
2021-09-11 17:07 ` Jeff King
2021-09-11 20:31 ` René Scharfe
2021-09-11 21:20 ` Jeff King
2021-09-11 23:39 ` René Scharfe
2021-09-11 20:31 ` [PATCH v2 0/5] packfile: use oidset for bad objects René Scharfe
2021-09-11 20:36 ` [PATCH 1/5] oidset: make oidset_size() an inline function René Scharfe
2021-09-11 20:39 ` René Scharfe [this message]
2021-09-11 20:40 ` [PATCH 3/5] packfile: convert mark_bad_packed_object() to object_id René Scharfe
2021-09-11 20:42 ` [PATCH v2 4/5] packfile: convert has_packed_and_bad() " René Scharfe
2021-09-11 20:43 ` [PATCH v2 5/5] packfile: use oidset for bad objects René Scharfe
2021-09-11 20:45 ` [PATCH v2 0/5] " René Scharfe
2021-09-11 21:22 ` Jeff King
2021-09-11 23:59 ` Derrick Stolee
2021-09-12 1:51 ` Taylor Blau
2021-09-12 2:29 ` Taylor Blau
2021-09-12 3:51 ` Derrick Stolee
2021-09-12 4:01 ` Taylor Blau
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=06f0f546-31c6-9cf5-5e11-999cb354c91a@web.de \
--to=l.s.r@web.de \
--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).