admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run-command.c: don't copy "data" to "struct parallel_processes"

Browse Source 
As with the *_fn members removed in a preceding commit, let's not copy
the "data" member of the "struct run_process_parallel_opts" over to
the "struct parallel_processes". Now that we're passing the "opts"
down there's no reason to do so.

This makes the code easier to follow, as we have a "const" attribute
on the "struct run_process_parallel_opts", but not "struct
parallel_processes". We do not alter the "ungroup" argument, so
storing it in the non-const structure would make this control flow
less obvious.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-10-12 23:02:31 +02:00
committed by Junio C Hamano
parent 357f8e6e18
commit 2aa8d2259f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
run-command.c
View File

@@ -1497,8 +1497,6 @@ enum child_state {
}; };
struct parallel_processes { struct parallel_processes {
void *const data;
const size_t max_processes; const size_t max_processes;
size_t nr_processes; size_t nr_processes;
@@ -1609,7 +1607,7 @@ static int pp_start_one(struct parallel_processes *pp,
code = opts->get_next_task(&pp->children[i].process, code = opts->get_next_task(&pp->children[i].process,
opts->ungroup ? NULL : &pp->children[i].err, opts->ungroup ? NULL : &pp->children[i].err,
pp->data, opts->data,
&pp->children[i].data); &pp->children[i].data);
if (!code) { if (!code) {
if (!opts->ungroup) { if (!opts->ungroup) {
@@ -1628,7 +1626,7 @@ static int pp_start_one(struct parallel_processes *pp,
if (opts->start_failure) if (opts->start_failure)
code = opts->start_failure(opts->ungroup ? NULL : code = opts->start_failure(opts->ungroup ? NULL :
&pp->children[i].err, &pp->children[i].err,
pp->data, opts->data,
pp->children[i].data); pp->children[i].data);
else else
code = 0; code = 0;
@@ -1705,7 +1703,7 @@ static int pp_collect_finished(struct parallel_processes *pp,
if (opts->task_finished) if (opts->task_finished)
code = opts->task_finished(code, opts->ungroup ? NULL : code = opts->task_finished(code, opts->ungroup ? NULL :
&pp->children[i].err, pp->data, &pp->children[i].err, opts->data,
pp->children[i].data); pp->children[i].data);
else else
code = 0; code = 0;
@@ -1758,7 +1756,6 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
int spawn_cap = 4; int spawn_cap = 4;
struct parallel_processes pp = { struct parallel_processes pp = {
.max_processes = opts->processes, .max_processes = opts->processes,
.data = opts->data,
.buffered_output = STRBUF_INIT, .buffered_output = STRBUF_INIT,
}; };
/* options */ /* options */