Stefan Beller <sbeller@xxxxxxxxxx> 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@xxxxxxxxxx>
> ---
> 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;
> }
