mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 23:35:37 +00:00
Code Issues Releases Wiki Activity

parser: fixup "fix --jobs so jobs scaling is applied correctly"

Browse Source 
65ba20b955 provides a fix for job
scaling but during a merge conflict part of the patch got dropped.
This is the missing portion of the patch that was approved as part
of MR703

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/703
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2021-02-10 19:24:43 -08:00
parent 65ba20b955
commit 681c976550
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser/parser_main.c
View File

@@ -1324,6 +1324,8 @@ static long compute_jobs(long n, long j)
static void setup_parallel_compile(long ncpus, long maxcpus) static void setup_parallel_compile(long ncpus, long maxcpus)
{ {
/* jobs and parallel_max set by default, config or args */ /* jobs and parallel_max set by default, config or args */
if (jobs < 0 || jobs == JOBS_AUTO)
jobs_scale = 1;
jobs = compute_jobs(ncpus, jobs); jobs = compute_jobs(ncpus, jobs);
jobs_max = compute_jobs(maxcpus, jobs_max); jobs_max = compute_jobs(maxcpus, jobs_max);