From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 4/9] submodule: move global changed_submodule_names into fetch submodule struct
Date: Wed, 26 Sep 2018 15:19:13 -0700 [thread overview]
Message-ID: <xmqqo9cjj40u.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180925194755.105578-5-sbeller@google.com> (Stefan Beller's message of "Tue, 25 Sep 2018 12:47:50 -0700")
Stefan Beller <sbeller@google.com> writes:
> The `changed_submodule_names` are only used for fetching, so let's make it
> part of the struct that is passed around for fetching submodules.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> submodule.c | 42 +++++++++++++++++++++++-------------------
> 1 file changed, 23 insertions(+), 19 deletions(-)
Yup, the less file-scope static we have and the more of them moved
to a struct, the closer we get to be able to use multiple of them at
the same time, which is a very nice step in the right direction.
>
> diff --git a/submodule.c b/submodule.c
> index 22c64bd8559..17103379ba4 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -25,7 +25,7 @@
> #include "commit-reach.h"
>
> static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
> -static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP;
> +
> static int initialized_fetch_ref_tips;
> static struct oid_array ref_tips_before_fetch;
> static struct oid_array ref_tips_after_fetch;
> @@ -1110,7 +1110,22 @@ void check_for_new_submodule_commits(struct object_id *oid)
> oid_array_append(&ref_tips_after_fetch, oid);
> }
>
> -static void calculate_changed_submodule_paths(void)
> +struct submodule_parallel_fetch {
> + int count;
> + struct argv_array args;
> + struct repository *r;
> + const char *prefix;
> + int command_line_option;
> + int default_option;
> + int quiet;
> + int result;
> +
> + struct string_list changed_submodule_names;
> +};
> +#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, STRING_LIST_INIT_DUP }
> +
> +static void calculate_changed_submodule_paths(
> + struct submodule_parallel_fetch *spf)
> {
> struct argv_array argv = ARGV_ARRAY_INIT;
> struct string_list changed_submodules = STRING_LIST_INIT_DUP;
> @@ -1148,7 +1163,8 @@ static void calculate_changed_submodule_paths(void)
> continue;
>
> if (!submodule_has_commits(path, commits))
> - string_list_append(&changed_submodule_names, name->string);
> + string_list_append(&spf->changed_submodule_names,
> + name->string);
> }
>
> free_submodules_oids(&changed_submodules);
> @@ -1185,18 +1201,6 @@ int submodule_touches_in_range(struct object_id *excl_oid,
> return ret;
> }
>
> -struct submodule_parallel_fetch {
> - int count;
> - struct argv_array args;
> - struct repository *r;
> - const char *prefix;
> - int command_line_option;
> - int default_option;
> - int quiet;
> - int result;
> -};
> -#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0}
> -
> static int get_fetch_recurse_config(const struct submodule *submodule,
> struct submodule_parallel_fetch *spf)
> {
> @@ -1257,7 +1261,7 @@ static int get_next_submodule(struct child_process *cp,
> case RECURSE_SUBMODULES_ON_DEMAND:
> if (!submodule ||
> !string_list_lookup(
> - &changed_submodule_names,
> + &spf->changed_submodule_names,
> submodule->name))
> continue;
> default_argv = "on-demand";
> @@ -1349,8 +1353,8 @@ int fetch_populated_submodules(struct repository *r,
> argv_array_push(&spf.args, "--recurse-submodules-default");
> /* default value, "--submodule-prefix" and its value are added later */
>
> - calculate_changed_submodule_paths();
> - string_list_sort(&changed_submodule_names);
> + calculate_changed_submodule_paths(&spf);
> + string_list_sort(&spf.changed_submodule_names);
> run_processes_parallel(max_parallel_jobs,
> get_next_submodule,
> fetch_start_failure,
> @@ -1359,7 +1363,7 @@ int fetch_populated_submodules(struct repository *r,
>
> argv_array_clear(&spf.args);
> out:
> - string_list_clear(&changed_submodule_names, 1);
> + string_list_clear(&spf.changed_submodule_names, 1);
> return spf.result;
> }
next prev parent reply other threads:[~2018-09-26 22:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-25 19:47 [PATCH v4 0/9] fetch: make sure submodule oids are fetched Stefan Beller
2018-09-25 19:47 ` [PATCH v4 1/9] sha1-array: provide oid_array_filter Stefan Beller
2018-09-26 22:17 ` Junio C Hamano
2018-09-25 19:47 ` [PATCH v4 2/9] submodule.c: fix indentation Stefan Beller
2018-09-26 22:18 ` Junio C Hamano
2018-09-25 19:47 ` [PATCH v4 3/9] submodule.c: sort changed_submodule_names before searching it Stefan Beller
2018-09-26 22:14 ` Junio C Hamano
2018-09-25 19:47 ` [PATCH v4 4/9] submodule: move global changed_submodule_names into fetch submodule struct Stefan Beller
2018-09-26 22:19 ` Junio C Hamano [this message]
2018-09-25 19:47 ` [PATCH v4 5/9] submodule.c: do not copy around submodule list Stefan Beller
2018-09-25 19:47 ` [PATCH v4 6/9] repository: repo_submodule_init to take a submodule struct Stefan Beller
2018-09-25 19:47 ` [PATCH v4 7/9] submodule: fetch in submodules git directory instead of in worktree Stefan Beller
2018-09-25 19:47 ` [PATCH v4 8/9] fetch: retry fetching submodules if needed objects were not fetched Stefan Beller
2018-09-25 19:47 ` [PATCH v4 9/9] builtin/fetch: check for submodule updates for non branch fetches Stefan Beller
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=xmqqo9cjj40u.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.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.
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).