move jobs properites in arduino/builder component

Author: alessio-perugini

arduino/builder/builder.go

@@ -26,6 +26,9 @@ type Builder struct {
 	sketch          *sketch.Sketch
 	buildProperties *properties.Map
 
+	// Parallel processes
+	jobs int
+
 	// core related
 	coreBuildCachePath *paths.Path
 }
@@ -37,6 +40,7 @@ func NewBuilder(
 	buildPath *paths.Path,
 	optimizeForDebug bool,
 	coreBuildCachePath *paths.Path,
+	jobs int,
 ) *Builder {
 	buildProperties := properties.NewMap()
 	if boardBuildProperties != nil {
@@ -64,10 +68,16 @@ func NewBuilder(
 		sketch:             sk,
 		buildProperties:    buildProperties,
 		coreBuildCachePath: coreBuildCachePath,
+		jobs:               jobs,
 	}
 }
 
 // GetBuildProperties returns the build properties for running this build
 func (b *Builder) GetBuildProperties() *properties.Map {
 	return b.buildProperties
 }
+
+// Jobs number of parallel processes
+func (b *Builder) Jobs() int {
+	return b.jobs
+}

arduino/builder/sketch_test.go

@@ -48,7 +48,7 @@ func TestMergeSketchSources(t *testing.T) {
 	}
 	mergedSources := strings.ReplaceAll(string(mergedBytes), "%s", pathToGoldenSource)
 
-	b := NewBuilder(sk, nil, nil, false, nil)
+	b := NewBuilder(sk, nil, nil, false, nil, 0)
 	offset, source, err := b.sketchMergeSources(nil)
 	require.Nil(t, err)
 	require.Equal(t, 2, offset)
@@ -61,7 +61,7 @@ func TestMergeSketchSourcesArduinoIncluded(t *testing.T) {
 	require.NotNil(t, sk)
 
 	// ensure not to include Arduino.h when it's already there
-	b := NewBuilder(sk, nil, nil, false, nil)
+	b := NewBuilder(sk, nil, nil, false, nil, 0)
 	_, source, err := b.sketchMergeSources(nil)
 	require.Nil(t, err)
 	require.Equal(t, 1, strings.Count(source, "<Arduino.h>"))
@@ -76,7 +76,7 @@ func TestCopyAdditionalFiles(t *testing.T) {
 	sk1, err := sketch.New(paths.New("testdata", t.Name()))
 	require.Nil(t, err)
 	require.Equal(t, sk1.AdditionalFiles.Len(), 1)
-	b1 := NewBuilder(sk1, nil, nil, false, nil)
+	b1 := NewBuilder(sk1, nil, nil, false, nil, 0)
 
 	// copy the sketch over, create a fake main file we don't care about it
 	// but we need it for `SketchLoad` to succeed later

commands/compile/compile.go

@@ -169,7 +169,14 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		coreBuildCachePath = buildCachePath.Join("core")
 	}
 
-	sketchBuilder := bldr.NewBuilder(sk, boardBuildProperties, buildPath, req.GetOptimizeForDebug(), coreBuildCachePath)
+	sketchBuilder := bldr.NewBuilder(
+		sk,
+		boardBuildProperties,
+		buildPath,
+		req.GetOptimizeForDebug(),
+		coreBuildCachePath,
+		int(req.GetJobs()),
+	)
 
 	buildProperties := sketchBuilder.GetBuildProperties()
 
@@ -212,7 +219,6 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	)
 
 	builderCtx.Verbose = req.GetVerbose()
-	builderCtx.Jobs = int(req.GetJobs())
 
 	builderCtx.WarningsLevel = req.GetWarnings()
 	if builderCtx.WarningsLevel == "" {

legacy/builder/builder.go

@@ -77,7 +77,7 @@ func (s *Builder) Run(ctx *types.Context) error {
 				ctx.OnlyUpdateCompilationDatabase,
 				ctx.Verbose,
 				ctx.CompilationDatabase,
-				ctx.Jobs,
+				ctx.Builder.Jobs(),
 				ctx.WarningsLevel,
 				ctx.Stdout, ctx.Stderr,
 				func(msg string) { ctx.Info(msg) },
@@ -117,7 +117,7 @@ func (s *Builder) Run(ctx *types.Context) error {
 				ctx.Verbose,
 				ctx.OnlyUpdateCompilationDatabase,
 				ctx.CompilationDatabase,
-				ctx.Jobs,
+				ctx.Builder.Jobs(),
 				ctx.WarningsLevel,
 				ctx.Stdout,
 				ctx.Stderr,
@@ -149,7 +149,7 @@ func (s *Builder) Run(ctx *types.Context) error {
 				ctx.ActualPlatform,
 				ctx.Verbose, ctx.OnlyUpdateCompilationDatabase, ctx.Clean,
 				ctx.CompilationDatabase,
-				ctx.Jobs,
+				ctx.Builder.Jobs(),
 				ctx.WarningsLevel,
 				ctx.Stdout, ctx.Stderr,
 				func(msg string) { ctx.Info(msg) },

legacy/builder/test/builder_test.go

@@ -97,15 +97,15 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 		ctx.Sketch = sk
 	}
 
-	ctx.Builder = bldr.NewBuilder(ctx.Sketch, nil, nil, false, nil)
+	ctx.Builder = bldr.NewBuilder(ctx.Sketch, nil, nil, false, nil, 0)
 	if fqbn != "" {
 		ctx.FQBN = parseFQBN(t, fqbn)
 		targetPackage, targetPlatform, targetBoard, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(ctx.FQBN)
 		require.NoError(t, err)
 		requiredTools, err := pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform)
 		require.NoError(t, err)
 
-		ctx.Builder = bldr.NewBuilder(ctx.Sketch, boardBuildProperties, ctx.BuildPath, false /*OptimizeForDebug*/, nil)
+		ctx.Builder = bldr.NewBuilder(ctx.Sketch, boardBuildProperties, ctx.BuildPath, false /*OptimizeForDebug*/, nil, 0)
 		ctx.PackageManager = pme
 		ctx.TargetBoard = targetBoard
 		ctx.BuildProperties = ctx.Builder.GetBuildProperties()

legacy/builder/types/context.go

@@ -83,9 +83,6 @@ type Context struct {
 	// Custom build properties defined by user (line by line as "key=value" pairs)
 	CustomBuildProperties []string
 
-	// Parallel processes
-	Jobs int
-
 	// Out and Err stream to redirect all output
 	Stdout  io.Writer
 	Stderr  io.Writer