=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/job.c,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- src/usr.bin/make/job.c 2020/01/13 15:00:59 1.150 +++ src/usr.bin/make/job.c 2020/01/13 15:05:18 1.151 @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.150 2020/01/13 15:00:59 espie Exp $ */ +/* $OpenBSD: job.c,v 1.151 2020/01/13 15:05:18 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* @@ -145,7 +145,6 @@ static Job *prepare_job(GNode *); static void determine_job_next_step(Job *); static void may_continue_job(Job *); -static void continue_job(Job *); static Job *reap_finished_job(pid_t); static bool reap_jobs(void); static void may_continue_heldback_jobs(); @@ -689,20 +688,15 @@ (long)mypid, job->node->name); job->next = heldJobs; heldJobs = job; - } else - continue_job(job); + } else { + bool finished = job_run_next(job); + if (finished) + postprocess_job(job); + else if (!sequential) + determine_expensive_job(job); + } } -static void -continue_job(Job *job) -{ - bool finished = job_run_next(job); - if (finished) - postprocess_job(job); - else if (!sequential) - determine_expensive_job(job); -} - /*- *----------------------------------------------------------------------- * Job_Make -- @@ -760,7 +754,7 @@ if (DEBUG(EXPENSIVE)) fprintf(stderr, "[%ld] cheap -> release %s\n", (long)mypid, job->node->name); - continue_job(job); + may_continue_job(job); } else break; }