Commitce6c187

committed

Defaults to runtime.NumCPU() if specified jobs number is 0

1 parent0785c72 commitce6c187Copy full SHA for ce6c187

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ import (`
`23`	`23`	`"fmt"`
`24`	`24`	`"io"`
`25`	`25`	`"path/filepath"`
`26`		`-"runtime"`
`27`	`26`	`"sort"`
`28`	`27`	`"strings"`
`29`	`28`
`@@ -116,11 +115,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W`
`116`	`115`
`117`	`116`	`builderCtx.CoreBuildCachePath=paths.TempDir().Join("arduino-core-cache")`
`118`	`117`
`119`		`-jobs:=runtime.NumCPU()`
`120`		`-ifreq.GetJobs()>0 {`
`121`		`-jobs=int(req.GetJobs())`
`122`		`-}`
`123`		`-builderCtx.Jobs=jobs`
	`118`	`+builderCtx.Jobs=int(req.GetJobs())`
`124`	`119`
`125`	`120`	`builderCtx.USBVidPid=req.GetVidPid()`
`126`	`121`	`builderCtx.WarningsLevel=req.GetWarnings()`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import (`
`33`	`33`	`"os"`
`34`	`34`	`"os/exec"`
`35`	`35`	`"path/filepath"`
	`36`	`+"runtime"`
`36`	`37`	`"strconv"`
`37`	`38`	`"strings"`
`38`	`39`	`"sync"`
`@@ -192,7 +193,11 @@ func compileFilesWithRecipe(ctx types.Context, sourcePath paths.Path, sources`
`192`	`193`
`193`	`194`	`// Spawn jobs runners`
`194`	`195`	`varwg sync.WaitGroup`
`195`		`-fori:=0;i<ctx.Jobs;i++ {`
	`196`	`+jobs:=ctx.Jobs`
	`197`	`+ifjobs==0 {`
	`198`	`+jobs=runtime.NumCPU()`
	`199`	`+}`
	`200`	`+fori:=0;i<jobs;i++ {`
`196`	`201`	`wg.Add(1)`
`197`	`202`	`gofunc() {`
`198`	`203`	`forsource:=rangequeue {`

Comments

(0)