Add a mutex to avoid map concurrent access

facchinm · facchinm · commit 1d0eb0a1789f · 2018-10-15T18:51:53.000+02:00
diff --git a/builder_utils/utils.go b/builder_utils/utils.go
@@ -207,6 +207,8 @@ func compileFilesWithRecipe(ctx *types.Context, objectFiles []string, sourcePath
 	}
 }
 
+var warningCacheMutex sync.Mutex
+
 func compileFileWithRecipe(ctx *types.Context, sourcePath string, source string, buildPath string, buildProperties properties.Map, includes []string, recipe string) (string, error) {
 	logger := ctx.GetLogger()
 	properties := buildProperties.Clone()
@@ -234,7 +236,9 @@ func compileFileWithRecipe(ctx *types.Context, sourcePath string, source string,
 		if err != nil {
 			return "", i18n.WrapError(err)
 		}
+		warningCacheMutex.Lock()
 		ctx.WarningsCache[source] = string(stderrCache)
+		warningCacheMutex.Unlock()
 	} else {
 		if ctx.Verbose {
 			logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, properties[constants.BUILD_PROPERTIES_OBJECT_FILE])

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,8 @@ func compileFilesWithRecipe(ctx *types.Context, objectFiles []string, sourcePath`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
	`210`	`+var warningCacheMutex sync.Mutex`
	`211`	`+`
`210`	`212`	`func compileFileWithRecipe(ctx *types.Context, sourcePath string, source string, buildPath string, buildProperties properties.Map, includes []string, recipe string) (string, error) {`
`211`	`213`	`logger := ctx.GetLogger()`
`212`	`214`	`properties := buildProperties.Clone()`
`@@ -234,7 +236,9 @@ func compileFileWithRecipe(ctx *types.Context, sourcePath string, source string,`
`234`	`236`	`if err != nil {`
`235`	`237`	`return "", i18n.WrapError(err)`
`236`	`238`	`}`
	`239`	`+ warningCacheMutex.Lock()`
`237`	`240`	`ctx.WarningsCache[source] = string(stderrCache)`
	`241`	`+ warningCacheMutex.Unlock()`
`238`	`242`	`} else {`
`239`	`243`	`if ctx.Verbose {`
`240`	`244`	`logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_PREVIOUS_COMPILED_FILE, properties[constants.BUILD_PROPERTIES_OBJECT_FILE])`