kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

run-command.c: use "opts->processes", not "pp->max_processes" 

Neither the "processes" nor "max_processes" members ever change after
their initialization, and they're always equivalent, but some existing
code used "pp->max_processes" when we were already passing the "opts"
to the function, let's use the "opts" directly instead.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2022-10-12 23:02:32 +02:00 committed by Junio C Hamano
parent 2aa8d2259f
commit 9f3df6c048
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
run-command.c
View File

@ -1599,10 +1599,10 @@ static int pp_start_one(struct parallel_processes *pp,
size_t i; size_t i;
int code; int code;


for (i = 0; i < pp->max_processes; i++) for (i = 0; i < opts->processes; i++)
if (pp->children[i].state == GIT_CP_FREE) if (pp->children[i].state == GIT_CP_FREE)
break; break;
if (i == pp->max_processes) if (i == opts->processes)
BUG("bookkeeping is hard"); BUG("bookkeeping is hard");


code = opts->get_next_task(&pp->children[i].process, code = opts->get_next_task(&pp->children[i].process,
@ -1689,14 +1689,14 @@ static int pp_collect_finished(struct parallel_processes *pp,
const struct run_process_parallel_opts *opts) const struct run_process_parallel_opts *opts)
{ {
int code; int code;
size_t i, n = pp->max_processes; size_t i;
int result = 0; int result = 0;


while (pp->nr_processes > 0) { while (pp->nr_processes > 0) {
for (i = 0; i < pp->max_processes; i++) for (i = 0; i < opts->processes; i++)
if (pp->children[i].state == GIT_CP_WAIT_CLEANUP) if (pp->children[i].state == GIT_CP_WAIT_CLEANUP)
break; break;
if (i == pp->max_processes) if (i == opts->processes)
break; break;


code = finish_command(&pp->children[i].process); code = finish_command(&pp->children[i].process);
@ -1725,6 +1725,8 @@ static int pp_collect_finished(struct parallel_processes *pp,
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err); strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
strbuf_reset(&pp->children[i].err); strbuf_reset(&pp->children[i].err);
} else { } else {
const size_t n = opts->processes;

strbuf_write(&pp->children[i].err, stderr); strbuf_write(&pp->children[i].err, stderr);
strbuf_reset(&pp->children[i].err); strbuf_reset(&pp->children[i].err);


@ -1771,7 +1773,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
while (1) { while (1) {
for (i = 0; for (i = 0;
i < spawn_cap && !pp.shutdown && i < spawn_cap && !pp.shutdown &&
pp.nr_processes < pp.max_processes; pp.nr_processes < opts->processes;
i++) { i++) {
code = pp_start_one(&pp, opts); code = pp_start_one(&pp, opts);
if (!code) if (!code)
@ -1785,7 +1787,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
if (!pp.nr_processes) if (!pp.nr_processes)
break; break;
if (opts->ungroup) { if (opts->ungroup) {
for (size_t i = 0; i < pp.max_processes; i++) for (size_t i = 0; i < opts->processes; i++)
pp.children[i].state = GIT_CP_WAIT_CLEANUP; pp.children[i].state = GIT_CP_WAIT_CLEANUP;
} else { } else {
pp_buffer_stderr(&pp, output_timeout); pp_buffer_stderr(&pp, output_timeout);