Skip to content

Commit 9f3df6c

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2aa8d22 commit 9f3df6c

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

run-command.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,10 +1599,10 @@ static int pp_start_one(struct parallel_processes *pp,
15991599
size_t i;
16001600
int code;
16011601

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

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

16951695
while (pp->nr_processes > 0) {
1696-
for (i = 0; i < pp->max_processes; i++)
1696+
for (i = 0; i < opts->processes; i++)
16971697
if (pp->children[i].state == GIT_CP_WAIT_CLEANUP)
16981698
break;
1699-
if (i == pp->max_processes)
1699+
if (i == opts->processes)
17001700
break;
17011701

17021702
code = finish_command(&pp->children[i].process);
@@ -1725,6 +1725,8 @@ static int pp_collect_finished(struct parallel_processes *pp,
17251725
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
17261726
strbuf_reset(&pp->children[i].err);
17271727
} else {
1728+
const size_t n = opts->processes;
1729+
17281730
strbuf_write(&pp->children[i].err, stderr);
17291731
strbuf_reset(&pp->children[i].err);
17301732

@@ -1771,7 +1773,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
17711773
while (1) {
17721774
for (i = 0;
17731775
i < spawn_cap && !pp.shutdown &&
1774-
pp.nr_processes < pp.max_processes;
1776+
pp.nr_processes < opts->processes;
17751777
i++) {
17761778
code = pp_start_one(&pp, opts);
17771779
if (!code)
@@ -1785,7 +1787,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
17851787
if (!pp.nr_processes)
17861788
break;
17871789
if (opts->ungroup) {
1788-
for (size_t i = 0; i < pp.max_processes; i++)
1790+
for (size_t i = 0; i < opts->processes; i++)
17891791
pp.children[i].state = GIT_CP_WAIT_CLEANUP;
17901792
} else {
17911793
pp_buffer_stderr(&pp, output_timeout);

0 commit comments

Comments
 (0)