From: Junio C Hamano <gitster@pobox.com>
To: "Rose via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Seija Kijin <doremylover123@gmail.com>
Subject: Re: [PATCH v2] merge: break out of all_strategy loop when strategy is found
Date: Fri, 13 Jan 2023 10:24:22 -0800 [thread overview]
Message-ID: <xmqqbkn247jd.fsf@gitster.g> (raw)
In-Reply-To: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com> (Rose via GitGitGadget's message of "Mon, 09 Jan 2023 17:34:28 +0000")
"Rose via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Seija Kijin <doremylover123@gmail.com>
>
> strncmp does not modify any of the memory.
It may be a correct statement, but so what? It does not seem to
have relevance to this change.
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 0f093f2a4f2..74de2ebd2b3 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -188,7 +188,7 @@ static struct strategy *get_strategy(const char *name)
> for (i = 0; i < main_cmds.cnt; i++) {
> int j, found = 0;
> struct cmdname *ent = main_cmds.names[i];
> - for (j = 0; j < ARRAY_SIZE(all_strategy); j++)
> + for (j = 0; !found && j < ARRAY_SIZE(all_strategy); j++)
> if (!strncmp(ent->name, all_strategy[j].name, ent->len)
> && !all_strategy[j].name[ent->len])
> found = 1;
I am not sure if this micro-optimization is worth it.
If this loop is so costly that it needs optimization, a better thing
to do would be to rethink the way it filters main_cmds.names[] array
with all_strategy[]. The latter is a fairly small, and more
importantly, a constant set of known strategies, so there should be
a more efficient way than O(n*m) nested loop.
The code churn has already costed us too much, mostly reviewer and
maintainer time, for the value of the change itself. I'll queue the
patch as-is, because this change is not making anything worse
per-se, but primarily because I do not want the topic to take any
more of our resources.
Thanks.
prev parent reply other threads:[~2023-01-13 18:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-08 18:39 [PATCH] merge: break out of all_strategy loop when strategy is found Rose via GitGitGadget
2023-01-09 5:14 ` Junio C Hamano
2023-01-09 17:34 ` [PATCH v2] " Rose via GitGitGadget
2023-01-13 18:24 ` Junio C Hamano [this message]
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=xmqqbkn247jd.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=doremylover123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).