Fix syncronization issues with "Multiple libraries found"

facchinm · cmaglie · commit 0051a834e363 · 2018-01-11T11:28:16.000+01:00
Signed-off-by: Martino Facchin &lt;m.facchin@arduino.cc&gt;
diff --git a/arduino-builder/main.go b/arduino-builder/main.go
@@ -177,12 +177,6 @@ func main() {
 		return
 	}
 
-	if *jobsFlag > 0 {
-		runtime.GOMAXPROCS(*jobsFlag)
-	} else {
-		runtime.GOMAXPROCS(runtime.NumCPU())
-	}
-
 	ctx := &types.Context{}
 
 	if *buildOptionsFileFlag != "" {
@@ -200,6 +194,14 @@ func main() {
 		ctx.InjectBuildOptions(buildOptions)
 	}
 
+	// Parallel Jobs flag
+	if *jobsFlag > 0 {
+		ctx.Jobs = *jobsFlag
+	} else {
+		ctx.Jobs = runtime.NumCPU()
+	}
+	runtime.GOMAXPROCS(ctx.Jobs)
+
 	// FLAG_HARDWARE
 	if hardwareFolders, err := toSliceOfUnquoted(hardwareFoldersFlag); err != nil {
 		printCompleteError(err)
diff --git a/print_used_and_not_used_libraries.go b/print_used_and_not_used_libraries.go
@@ -53,6 +53,10 @@ func (s *PrintUsedAndNotUsedLibraries) Run(ctx *types.Context) error {
 		return nil
 	}
 
+	if ctx.Jobs > 1 {
+		time.Sleep(100 * time.Millisecond)
+	}
+
 	logger := ctx.GetLogger()
 	libraryResolutionResults := ctx.LibrariesResolutionResults
 
@@ -64,7 +68,5 @@ func (s *PrintUsedAndNotUsedLibraries) Run(ctx *types.Context) error {
 		}
 	}
 
-	time.Sleep(100 * time.Millisecond)
-
 	return nil
 }
diff --git a/types/context.go b/types/context.go
@@ -88,6 +88,9 @@ type Context struct {
 
 	// ReadFileAndStoreInContext command
 	FileToRead string
+
+	// Max jobs
+	Jobs int
 }
 
 func (ctx *Context) ExtractBuildOptions() properties.Map {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ func (s PrintUsedAndNotUsedLibraries) Run(ctx types.Context) error {`
`53`	`53`	`return nil`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ if ctx.Jobs > 1 {`
	`57`	`+ time.Sleep(100 * time.Millisecond)`
	`58`	`+ }`
	`59`	`+`
`56`	`60`	`logger := ctx.GetLogger()`
`57`	`61`	`libraryResolutionResults := ctx.LibrariesResolutionResults`
`58`	`62`
`@@ -64,7 +68,5 @@ func (s PrintUsedAndNotUsedLibraries) Run(ctx types.Context) error {`
`64`	`68`	`}`
`65`	`69`	`}`
`66`	`70`
`67`		`- time.Sleep(100 * time.Millisecond)`
`68`		`-`
`69`	`71`	`return nil`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ type Context struct {`
`88`	`88`
`89`	`89`	`// ReadFileAndStoreInContext command`
`90`	`90`	`FileToRead string`
	`91`	`+`
	`92`	`+ // Max jobs`
	`93`	`+ Jobs int`
`91`	`94`	`}`
`92`	`95`
`93`	`96`	`func (ctx *Context) ExtractBuildOptions() properties.Map {`