tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrap singleton ninjaString Eval calls

Browse source 
This avoids a concurrent map read and write error in parallel
singletons.

Bug: 290795374
Test: manual, treehugger
Change-Id: I7f89909a98c4f530da92a3d2cc01ca8eaeddbfa0
This commit is contained in:
LaMont Jones 2023-07-11 19:58:01 +00:00
parent 5d3bfd147b
commit 7c2ebdef75
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
live_tracker.go
View file

@ -229,6 +229,12 @@ func (l *liveTracker) innerAddNinjaStringDeps(str *ninjaString) error {
return nil
}
func (l *liveTracker) Eval(n *ninjaString) (string, error) {
l.Lock()
defer l.Unlock()
return n.Eval(l.variables)
}
func (l *liveTracker) RemoveVariableIfLive(v Variable) bool {
l.Lock()
defer l.Unlock()

2
singleton_ctx.go
View file

@ -289,7 +289,7 @@ func (s *singletonContext) Eval(pctx PackageContext, str string) (string, error)
return "", err
}
return ninjaStr.Eval(s.globals.variables)
return s.globals.Eval(ninjaStr)
}
func (s *singletonContext) RequireNinjaVersion(major, minor, micro int) {