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>
Ævar Arnfjörð Bjarmason committed
Oct 12, 2022 at 23:02 UTC
9f3df6c0487bde80626ea2f367f9850e1758720b
1 file changed
+9
-7
run-command.c
+9
-7
@@ -1599,10 +1599,10 @@ static int pp_start_one(struct parallel_processes *pp,
1599
size_t i;
1600
int code;
1601
1602
- for (i = 0; i < pp->max_processes; i++)
1602
+ for (i = 0; i < opts->processes; i++)
1603
if (pp->children[i].state == GIT_CP_FREE)
1604
break;
1605
- if (i == pp->max_processes)
1605
+ if (i == opts->processes)
1606
BUG("bookkeeping is hard");
1607
1608
code = opts->get_next_task(&pp->children[i].process,
@@ -1689,14 +1689,14 @@ static int pp_collect_finished(struct parallel_processes *pp,
1689
const struct run_process_parallel_opts *opts)
1690
{
1691
int code;
1692
- size_t i, n = pp->max_processes;
1692
+ size_t i;
1693
int result = 0;
1694
1695
while (pp->nr_processes > 0) {
1696
- for (i = 0; i < pp->max_processes; i++)
1696
+ for (i = 0; i < opts->processes; i++)
1697
if (pp->children[i].state == GIT_CP_WAIT_CLEANUP)
1698
break;
1699
- if (i == pp->max_processes)
1699
+ if (i == opts->processes)
1700
break;
1701
1702
code = finish_command(&pp->children[i].process);
@@ -1725,6 +1725,8 @@ static int pp_collect_finished(struct parallel_processes *pp,
1725
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
1726
strbuf_reset(&pp->children[i].err);
1727
} else {
1728
+ const size_t n = opts->processes;
1729
+
1730
strbuf_write(&pp->children[i].err, stderr);
1731
strbuf_reset(&pp->children[i].err);
1732
@@ -1771,7 +1773,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
1773
while (1) {
1774
for (i = 0;
1775
i < spawn_cap && !pp.shutdown &&
1774
- pp.nr_processes < pp.max_processes;
1776
+ pp.nr_processes < opts->processes;
1777
i++) {
1778
code = pp_start_one(&pp, opts);
1779
if (!code)
@@ -1785,7 +1787,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
1787
if (!pp.nr_processes)
1788
break;
1789
if (opts->ungroup) {
1788
- for (size_t i = 0; i < pp.max_processes; i++)
1790
+ for (size_t i = 0; i < opts->processes; i++)
1791
pp.children[i].state = GIT_CP_WAIT_CLEANUP;
1792
} else {
1793
pp_buffer_stderr(&pp, output_timeout);