From: "René Scharfe" <l.s.r@web.de>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, gitster@pobox.com, peff@peff.net
Subject: Re: [PATCH v3 2/5] fetch-pack: load tip_oids eagerly iff needed
Date: Fri, 5 Oct 2018 22:13:24 +0200 [thread overview]
Message-ID: <413be4ec-2473-c971-8545-3b7effbc157e@web.de> (raw)
In-Reply-To: <a82bf622-8ef8-5525-c3a8-b983d0cfe662@web.de>
Am 05.10.2018 um 00:11 schrieb René Scharfe:
> Am 04.10.2018 um 23:38 schrieb Jonathan Tan:
>> I don't think the concerns are truly separated - the first loop quoted
>> needs to know that in the second loop, tip_oids is accessed only if
>> there is at least one unmatched ref.
>
> Right, the two loops are still closely related, but only the first one
> is concerned with loading refs.
>
> For a true separation we could first build a list of unmatched refs and
> then loop through that instead of `sought`. Not sure if that's better,
> but maybe the overhead I imagine it would introduce isn't all that big.
Here's what I mean, on top of the other two patches:
---
fetch-pack.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/fetch-pack.c b/fetch-pack.c
index 53914563b5..7f28584bce 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -543,6 +543,8 @@ static void filter_refs(struct fetch_pack_args *args,
struct ref *newlist = NULL;
struct ref **newtail = &newlist;
struct ref *unmatched = NULL;
+ struct ref **unfound;
+ int nr_unfound = 0;
struct ref *ref, *next;
struct oidset tip_oids = OIDSET_INIT;
int i;
@@ -584,23 +586,19 @@ static void filter_refs(struct fetch_pack_args *args,
}
}
- if (strict) {
- for (i = 0; i < nr_sought; i++) {
- ref = sought[i];
- if (!is_unmatched_ref(ref))
- continue;
-
- add_refs_to_oidset(&tip_oids, unmatched);
- add_refs_to_oidset(&tip_oids, newlist);
- break;
- }
+ ALLOC_ARRAY(unfound, nr_sought);
+ for (i = 0; i < nr_sought; i++) {
+ if (is_unmatched_ref(sought[i]))
+ unfound[nr_unfound++] = sought[i];
+ }
+ if (strict && nr_unfound) {
+ add_refs_to_oidset(&tip_oids, unmatched);
+ add_refs_to_oidset(&tip_oids, newlist);
}
/* Append unmatched requests to the list */
- for (i = 0; i < nr_sought; i++) {
- ref = sought[i];
- if (!is_unmatched_ref(ref))
- continue;
+ for (i = 0; i < nr_unfound; i++) {
+ ref = unfound[i];
if (!strict || oidset_contains(&tip_oids, &ref->old_oid)) {
ref->match_status = REF_MATCHED;
@@ -611,6 +609,7 @@ static void filter_refs(struct fetch_pack_args *args,
}
}
+ free(unfound);
oidset_clear(&tip_oids);
for (ref = unmatched; ref; ref = next) {
next = ref->next;
--
2.19.0
next prev parent reply other threads:[~2018-10-05 20:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 13:11 [PATCH v2 0/2] oidset: use khash René Scharfe
2018-10-03 13:12 ` [PATCH v2 1/2] khash: factor out kh_release_* René Scharfe
2018-10-03 13:16 ` [PATCH v2 2/2] oidset: use khash René Scharfe
2018-10-03 19:40 ` Jeff King
2018-10-04 5:56 ` René Scharfe
2018-10-04 6:48 ` Jeff King
2018-10-04 6:50 ` Jeff King
2018-10-04 15:05 ` René Scharfe
2018-10-04 15:05 ` [PATCH v3 0/5] " René Scharfe
2018-10-04 15:09 ` [PATCH v3 1/5] fetch-pack: factor out is_unmatched_ref() René Scharfe
2018-10-04 15:09 ` [PATCH v3 2/5] fetch-pack: load tip_oids eagerly iff needed René Scharfe
2018-10-04 21:38 ` Jonathan Tan
2018-10-04 22:11 ` René Scharfe
2018-10-05 20:13 ` René Scharfe [this message]
2018-10-04 22:14 ` Jeff King
2018-10-04 22:52 ` Jonathan Tan
2018-10-04 23:18 ` Jeff King
2018-10-04 22:07 ` Jeff King
2018-10-05 20:13 ` René Scharfe
2018-10-05 20:27 ` Jeff King
2018-10-05 21:22 ` René Scharfe
2018-10-05 21:47 ` Jeff King
2018-10-04 15:10 ` [PATCH v3 3/5] khash: factor out kh_release_* René Scharfe
2018-10-04 15:13 ` [PATCH v3 4/5] oidset: use khash René Scharfe
2018-10-04 15:14 ` [PATCH 5/5] oidset: uninline oidset_init() René Scharfe
2018-10-04 22:15 ` [PATCH v3 0/5] oidset: use khash 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=413be4ec-2473-c971-8545-3b7effbc157e@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.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).