From: Palmer Dabbelt <palmer@sifive.com>
To: Johannes.Schindelin@gmx.de
Cc: git@vger.kernel.org, peff@peff.net, e@80x24.org,
chriscool@tuxfamily.org, gitster@pobox.com,
jonathantanmy@google.com, tboegi@web.de, bwilliams.eng@gmail.com,
jeffhost@microsoft.com
Subject: Re: [PATCH v2 5/5] fetch: Make --jobs control submodules and remotes
Date: Tue, 13 Aug 2019 15:06:35 -0700 (PDT) [thread overview]
Message-ID: <mhng-0255a7a4-dc9c-4b61-91d7-f06776c734af@palmer-si-x1e> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1908132212420.656@tvgsbejvaqbjf.bet>
On Tue, 13 Aug 2019 13:16:11 PDT (-0700), Johannes.Schindelin@gmx.de wrote:
> Hi,
>
>
> On Mon, 12 Aug 2019, Palmer Dabbelt wrote:
>
>> The existing --jobs argument was defined to control the number of jobs
>> used for submodule fetching, but it makes more sense to have this
>> argument control the number of jobs to be used when fetching from
>> multiple remotes as well.
>>
>> This patch simply changes the --jobs argument parsing code to set both
>> max_children_for_{submodules,fetch}, as well as noting this new behavior
>> in the documentation.
>>
>> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
>> ---
>
> I very much miss in this description a reflection of my analysis in
> https://public-inbox.org/git/nycvar.QRO.7.76.6.1907191507420.47@tvgsbejvaqbjf.bet/
>
> Given that analysis, combined with the fact that the `--jobs` option
> tries to control both the `--multiple` and `--recursive-submodules` code
> paths in the end, anyway, I do doubt that it makes sense to even
> introduce the `--fetch-jobs` and the `--submodule-fetch-jobs` options;
> They are probably only confusing and do not add much benefit to the end
> user.
The cover letter at least attempts to describe this. I figured I'd have to
pick one option for a v2, so I went with the more complicated one under the
assumption it would be easy to re-spin a v3 that drops the extra arguments.
I'm happy to do so.
>
> Ciao,
> Johannes
>
>> Documentation/fetch-options.txt | 4 ++++
>> builtin/fetch.c | 21 ++++++++++++++++++---
>> 2 files changed, 22 insertions(+), 3 deletions(-)
>>
>> diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
>> index 5836024f1934..0915fd4ed6d5 100644
>> --- a/Documentation/fetch-options.txt
>> +++ b/Documentation/fetch-options.txt
>> @@ -160,6 +160,10 @@ ifndef::git-pull[]
>>
>> -j::
>> --jobs=<n>::
>> + Number of parallel children to be used for all forms of fetching.
>> + This is the same as passing `--submodule-fetch-jobs=<n>` and
>> + `--fetch-jobs=<n>`.
>> +
>> --submodule-fetch-jobs=<n>::
>> Number of parallel children to be used for fetching submodules.
>> Each will fetch from different submodules, such that fetching many
>> diff --git a/builtin/fetch.c b/builtin/fetch.c
>> index 67d001f3f78b..41498e9efb3b 100644
>> --- a/builtin/fetch.c
>> +++ b/builtin/fetch.c
>> @@ -114,6 +114,20 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
>> return git_default_config(k, v, cb);
>> }
>>
>> +static int parse_jobs_arg(const struct option *opt, const char *arg, int unset)
>> +{
>> + int jobs;
>> +
>> + jobs = atoi(arg);
>> + if (jobs < 1)
>> + die(_("There must be a positive number of jobs"));
>> +
>> + max_children_for_submodules = jobs;
>> + max_children_for_fetch = jobs;
>> +
>> + return 0;
>> +}
>> +
>> static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
>> {
>> BUG_ON_OPT_NEG(unset);
>> @@ -142,12 +156,13 @@ static struct option builtin_fetch_options[] = {
>> N_("fetch all tags and associated objects"), TAGS_SET),
>> OPT_SET_INT('n', NULL, &tags,
>> N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
>> - OPT_INTEGER('j', "jobs", &max_children_for_submodules,
>> + { OPTION_CALLBACK, 'j', "jobs", NULL, N_("jobs"),
>> + N_("number of parallel tasks to run while fetching"),
>> + PARSE_OPT_OPTARG, &parse_jobs_arg },
>> + OPT_INTEGER(0, "submodule-fetch-jobs", &max_children_for_submodules,
>> N_("number of submodules fetched in parallel")),
>> OPT_INTEGER(0, "fetch-jobs", &max_children_for_fetch,
>> N_("number of remotes fetched in parallel")),
>> - OPT_INTEGER(0, "submodule-fetch-jobs", &max_children_for_submodules,
>> - N_("number of submodules fetched in parallel")),
>> OPT_BOOL('p', "prune", &prune,
>> N_("prune remote-tracking branches no longer on remote")),
>> OPT_BOOL('P', "prune-tags", &prune_tags,
>> --
>> 2.21.0
>>
>>
next prev parent reply other threads:[~2019-08-13 22:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 21:34 [PATCH v2 0/5] fetch: Extend --jobs to multiple remotes Palmer Dabbelt
2019-08-12 21:34 ` [PATCH v2 1/5] fetch: Rename max_children to max_children_for_submodules Palmer Dabbelt
2019-08-12 21:34 ` [PATCH v2 2/5] fetch: Add the "--fetch-jobs" option Palmer Dabbelt
2019-08-13 14:44 ` Eric Wong
2019-08-12 21:34 ` [PATCH v2 3/5] fetch: Add the fetch.jobs config key Palmer Dabbelt
2019-08-12 21:34 ` [PATCH v2 4/5] fetch: Add the --submodule-fetch-jobs option Palmer Dabbelt
2019-08-12 21:34 ` [PATCH v2 5/5] fetch: Make --jobs control submodules and remotes Palmer Dabbelt
2019-08-13 20:16 ` Johannes Schindelin
2019-08-13 22:06 ` Palmer Dabbelt [this message]
2019-08-13 22:00 ` Junio C Hamano
2019-08-13 22:06 ` Palmer Dabbelt
2019-08-14 8:32 ` SZEDER Gábor
2019-08-14 15:54 ` Junio C Hamano
2019-08-14 18:33 ` Palmer Dabbelt
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=mhng-0255a7a4-dc9c-4b61-91d7-f06776c734af@palmer-si-x1e \
--to=palmer@sifive.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bwilliams.eng@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=tboegi@web.de \
/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).