all: rename build_jobs to build_cpus

The latter is a better suitable name.

7 files changed, 15 insertions, 15 deletions

diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go
index 1fd08d1ca..3f6c1ca07 100644
--- a/pkg/bisect/bisect.go
+++ b/pkg/bisect/bisect.go
@@ -37,7 +37,7 @@ type Config struct {
 	Manager         *mgrconfig.Config
 	BuildSemaphore  *instance.Semaphore
 	TestSemaphore   *instance.Semaphore
-	BuildJobs       int
+	BuildCPUs       int
 	// CrossTree specifies whether a cross tree bisection is to take place, i.e.
 	// Kernel.Commit is not reachable from Kernel.Branch.
 	// In this case, bisection starts from their merge base.
@@ -626,7 +626,7 @@ func (env *env) build() (*vcs.Commit, string, error) {
 		CmdlineFile:  kern.Cmdline,
 		SysctlFile:   kern.Sysctl,
 		KernelConfig: bisectEnv.KernelConfig,
-		BuildJobs:    env.cfg.BuildJobs,
+		BuildCPUs:    env.cfg.BuildCPUs,
 	})
 	if imageDetails.CompilerID != "" {
 		env.log("compiler: %v", imageDetails.CompilerID)
diff --git a/pkg/build/build.go b/pkg/build/build.go
index 2274ceb8e..bb6d089fd 100644
--- a/pkg/build/build.go
+++ b/pkg/build/build.go
@@ -38,7 +38,7 @@ type Params struct {
 	SysctlFile   string
 	Config       []byte
 	Tracer       debugtracer.DebugTracer
-	BuildJobs    int // If 0, all CPUs will be used.
+	BuildCPUs    int // If 0, all CPUs will be used.
 	Build        json.RawMessage
 }
 
@@ -73,8 +73,8 @@ func Image(params Params) (details ImageDetails, err error) {
 	if params.Tracer == nil {
 		params.Tracer = &debugtracer.NullTracer{}
 	}
-	if params.BuildJobs == 0 {
-		params.BuildJobs = runtime.NumCPU()
+	if params.BuildCPUs == 0 {
+		params.BuildCPUs = runtime.NumCPU()
 	}
 	var builder builder
 	builder, err = getBuilder(params.TargetOS, params.TargetArch, params.VMType)
diff --git a/pkg/build/freebsd.go b/pkg/build/freebsd.go
index 2c6e0fcc9..86d6f52ef 100644
--- a/pkg/build/freebsd.go
+++ b/pkg/build/freebsd.go
@@ -45,11 +45,11 @@ options 	DIAGNOSTIC
 		return ImageDetails{}, err
 	}
 	objPrefix := filepath.Join(params.KernelDir, "obj")
-	output, err := ctx.make(params.KernelDir, objPrefix, params.BuildJobs, "kernel-toolchain")
+	output, err := ctx.make(params.KernelDir, objPrefix, params.BuildCPUs, "kernel-toolchain")
 	if err != nil {
 		return ImageDetails{}, err
 	}
-	if _, err := ctx.make(params.KernelDir, objPrefix, params.BuildJobs, "buildkernel",
+	if _, err := ctx.make(params.KernelDir, objPrefix, params.BuildCPUs, "buildkernel",
 		"WITH_EXTRA_TCP_STACKS=", fmt.Sprintf("KERNCONF=%v", confFile)); err != nil {
 		// The kernel-toolchain make target has to be built separately
 		// because FreeBSD's build doesn't correctly order the two
diff --git a/pkg/build/linux.go b/pkg/build/linux.go
index b68a87bc1..db629411d 100644
--- a/pkg/build/linux.go
+++ b/pkg/build/linux.go
@@ -180,7 +180,7 @@ func runMakeImpl(arch, compiler, linker, ccache, kernelDir string, jobs int, ext
 
 func runMake(params Params, extraArgs ...string) error {
 	return runMakeImpl(params.TargetArch, params.Compiler, params.Linker, params.Ccache,
-		params.KernelDir, params.BuildJobs, extraArgs)
+		params.KernelDir, params.BuildCPUs, extraArgs)
 }
 
 func LinuxMakeArgs(target *targets.Target, compiler, linker, ccache, buildDir string, jobs int) []string {
diff --git a/pkg/build/netbsd.go b/pkg/build/netbsd.go
index 80ea02481..61c31a8c7 100644
--- a/pkg/build/netbsd.go
+++ b/pkg/build/netbsd.go
@@ -44,25 +44,25 @@ func (ctx netbsd) build(params Params) (ImageDetails, error) {
 	if strings.HasSuffix(params.Compiler, "clang++") {
 		// Build tools before building kernel.
 		if _, err := osutil.RunCmd(60*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch,
-			"-U", "-j"+strconv.Itoa(params.BuildJobs), "-V", "MKCTF=no",
+			"-U", "-j"+strconv.Itoa(params.BuildCPUs), "-V", "MKCTF=no",
 			"-V", "MKLLVM=yes", "-V", "MKGCC=no", "-V", "HAVE_LLVM=yes", "tools"); err != nil {
 			return ImageDetails{}, err
 		}
 
 		// Build kernel.
 		if _, err := osutil.RunCmd(20*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch,
-			"-U", "-j"+strconv.Itoa(params.BuildJobs), "-V", "MKCTF=no",
+			"-U", "-j"+strconv.Itoa(params.BuildCPUs), "-V", "MKCTF=no",
 			"-V", "MKLLVM=yes", "-V", "MKGCC=no", "-V", "HAVE_LLVM=yes", "kernel="+kernelName); err != nil {
 			return ImageDetails{}, err
 		}
 	} else if strings.HasSuffix(params.Compiler, "g++") {
 		if _, err := osutil.RunCmd(30*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch,
-			"-U", "-j"+strconv.Itoa(params.BuildJobs), "-V", "MKCTF=no", "tools"); err != nil {
+			"-U", "-j"+strconv.Itoa(params.BuildCPUs), "-V", "MKCTF=no", "tools"); err != nil {
 			return ImageDetails{}, err
 		}
 
 		if _, err := osutil.RunCmd(20*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch,
-			"-U", "-j"+strconv.Itoa(params.BuildJobs), "-V", "MKCTF=no", "kernel="+kernelName); err != nil {
+			"-U", "-j"+strconv.Itoa(params.BuildCPUs), "-V", "MKCTF=no", "kernel="+kernelName); err != nil {
 			return ImageDetails{}, err
 		}
 	}
diff --git a/pkg/build/openbsd.go b/pkg/build/openbsd.go
index bb069f90b..bcc16dc8c 100644
--- a/pkg/build/openbsd.go
+++ b/pkg/build/openbsd.go
@@ -31,7 +31,7 @@ func (ctx openbsd) build(params Params) (ImageDetails, error) {
 		return ImageDetails{}, err
 	}
 	for _, tgt := range []string{"clean", "obj", "config", "all"} {
-		if err := ctx.make(compileDir, params.BuildJobs, tgt); err != nil {
+		if err := ctx.make(compileDir, params.BuildCPUs, tgt); err != nil {
 			return ImageDetails{}, err
 		}
 	}
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index 0012444f0..ab79569f9 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -49,7 +49,7 @@ type BuildKernelConfig struct {
 	CmdlineFile  string
 	SysctlFile   string
 	KernelConfig []byte
-	BuildJobs    int
+	BuildCPUs    int
 }
 
 func NewEnv(cfg *mgrconfig.Config, buildSem, testSem *Semaphore) (Env, error) {
@@ -154,7 +154,7 @@ func (env *env) BuildKernel(buildCfg *BuildKernelConfig) (
 		CmdlineFile:  buildCfg.CmdlineFile,
 		SysctlFile:   buildCfg.SysctlFile,
 		Config:       buildCfg.KernelConfig,
-		BuildJobs:    buildCfg.BuildJobs,
+		BuildCPUs:    buildCfg.BuildCPUs,
 	}
 	details, err := build.Image(params)
 	if err != nil {