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

Parallelize VerifyProvidersWereUnchanged

Browse source 
This makes it faster than the write_files step that it's in parallel
with. It's a ~3 second improvement to soong's runtime on my computer
on aosp main.

I'm not using parallelVisit() this time around, because
VerifyProvidersWereUnchanged is run in parallel with other code
that also uses parallelVisit(), and parallelVisit() modifies
module.waitingCount, so they conflict with each other.

Bug: 335718784
Test: m nothing
Change-Id: I4c6a4c30e2ffc4606faad378f59e003a02826848
This commit is contained in:
Cole Faust 2024-05-24 12:10:06 -07:00
parent 6daa49ee97
commit 7b7b1db4a8
1 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
context.go
View file

@ -4144,23 +4144,50 @@ func (c *Context) VerifyProvidersWereUnchanged() []error {
if !c.buildActionsReady {
return []error{ErrBuildActionsNotReady}
}
var errors []error
for _, m := range c.modulesSorted {
for i, provider := range m.providers {
if provider != nil {
hash, err := proptools.HashProvider(provider)
if err != nil {
errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set, and no longer hashable afterwards: %s", providerRegistry[i].typ, m.Name(), err.Error()))
continue
}
if provider != nil && m.providerInitialValueHashes[i] != hash {
errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set", providerRegistry[i].typ, m.Name()))
}
} else if m.providerInitialValueHashes[i] != 0 {
// This should be unreachable, because in setProvider we check if the provider has already been set.
errors = append(errors, fmt.Errorf("provider %q on module %q was unset somehow, this is an internal error", providerRegistry[i].typ, m.Name()))
}
toProcess := make(chan *moduleInfo)
errorCh := make(chan []error)
var wg sync.WaitGroup
go func() {
for _, m := range c.modulesSorted {
toProcess <- m
}
close(toProcess)
}()
for i := 0; i < 1000; i++ {
wg.Add(1)
go func() {
var errors []error
for m := range toProcess {
for i, provider := range m.providers {
if provider != nil {
hash, err := proptools.HashProvider(provider)
if err != nil {
errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set, and no longer hashable afterwards: %s", providerRegistry[i].typ, m.Name(), err.Error()))
continue
}
if m.providerInitialValueHashes[i] != hash {
errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set", providerRegistry[i].typ, m.Name()))
}
} else if m.providerInitialValueHashes[i] != 0 {
// This should be unreachable, because in setProvider we check if the provider has already been set.
errors = append(errors, fmt.Errorf("provider %q on module %q was unset somehow, this is an internal error", providerRegistry[i].typ, m.Name()))
}
}
}
if errors != nil {
errorCh <- errors
}
wg.Done()
}()
}
go func() {
wg.Wait()
close(errorCh)
}()
var errors []error
for newErrors := range errorCh {
errors = append(errors, newErrors...)
}
return errors
}