Write ninja file in parallel.

Bug: 335718784
Test: CI
Change-Id: I26f7babca349c654780711cfe0f0ece3faa5f436
This commit is contained in:
Yu Liu 2024-05-15 19:16:55 +00:00
parent 515e7991fc
commit 82e444710d
6 changed files with 99 additions and 14 deletions

View file

@ -128,6 +128,7 @@ bootstrap_go_package {
"proptools/tag.go", "proptools/tag.go",
"proptools/typeequal.go", "proptools/typeequal.go",
"proptools/unpack.go", "proptools/unpack.go",
"proptools/utils.go",
], ],
testSrcs: [ testSrcs: [
"proptools/clone_test.go", "proptools/clone_test.go",

View file

@ -151,7 +151,6 @@ func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, conf
providersValidationChan <- nil providersValidationChan <- nil
} }
const outFilePermissions = 0666
var out blueprint.StringWriterWriter var out blueprint.StringWriterWriter
var f *os.File var f *os.File
var buf *bufio.Writer var buf *bufio.Writer
@ -159,12 +158,12 @@ func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, conf
ctx.BeginEvent("write_files") ctx.BeginEvent("write_files")
defer ctx.EndEvent("write_files") defer ctx.EndEvent("write_files")
if args.EmptyNinjaFile { if args.EmptyNinjaFile {
if err := os.WriteFile(joinPath(ctx.SrcDir(), args.OutFile), []byte(nil), outFilePermissions); err != nil { if err := os.WriteFile(joinPath(ctx.SrcDir(), args.OutFile), []byte(nil), blueprint.OutFilePermissions); err != nil {
return nil, fmt.Errorf("error writing empty Ninja file: %s", err) return nil, fmt.Errorf("error writing empty Ninja file: %s", err)
} }
out = io.Discard.(blueprint.StringWriterWriter) out = io.Discard.(blueprint.StringWriterWriter)
} else { } else {
f, err := os.OpenFile(joinPath(ctx.SrcDir(), args.OutFile), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, outFilePermissions) f, err := os.OpenFile(joinPath(ctx.SrcDir(), args.OutFile), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, blueprint.OutFilePermissions)
if err != nil { if err != nil {
return nil, fmt.Errorf("error opening Ninja file: %s", err) return nil, fmt.Errorf("error opening Ninja file: %s", err)
} }
@ -173,7 +172,7 @@ func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, conf
out = buf out = buf
} }
if err := ctx.WriteBuildFile(out); err != nil { if err := ctx.WriteBuildFile(out, !strings.Contains(args.OutFile, "bootstrap.ninja") && !args.EmptyNinjaFile, args.OutFile); err != nil {
return nil, fmt.Errorf("error writing Ninja file contents: %s", err) return nil, fmt.Errorf("error writing Ninja file contents: %s", err)
} }

View file

@ -251,7 +251,7 @@ func generateGlobNinjaFile(glob *GlobSingleton, config interface{}) ([]byte, []e
} }
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
err := ctx.WriteBuildFile(buf) err := ctx.WriteBuildFile(buf, false, "")
if err != nil { if err != nil {
return nil, []error{err} return nil, []error{err}
} }

View file

@ -15,6 +15,7 @@
package blueprint package blueprint
import ( import (
"bufio"
"bytes" "bytes"
"cmp" "cmp"
"context" "context"
@ -37,6 +38,7 @@ import (
"sync/atomic" "sync/atomic"
"text/scanner" "text/scanner"
"text/template" "text/template"
"time"
"unsafe" "unsafe"
"github.com/google/blueprint/metrics" "github.com/google/blueprint/metrics"
@ -50,6 +52,8 @@ var ErrBuildActionsNotReady = errors.New("build actions are not ready")
const maxErrors = 10 const maxErrors = 10
const MockModuleListFile = "bplist" const MockModuleListFile = "bplist"
const OutFilePermissions = 0666
// A Context contains all the state needed to parse a set of Blueprints files // A Context contains all the state needed to parse a set of Blueprints files
// and generate a Ninja file. The process of generating a Ninja file proceeds // and generate a Ninja file. The process of generating a Ninja file proceeds
// through a series of four phases. Each phase corresponds with a some methods // through a series of four phases. Each phase corresponds with a some methods
@ -4164,7 +4168,7 @@ func (c *Context) VerifyProvidersWereUnchanged() []error {
// WriteBuildFile writes the Ninja manifest text for the generated build // WriteBuildFile writes the Ninja manifest text for the generated build
// actions to w. If this is called before PrepareBuildActions successfully // actions to w. If this is called before PrepareBuildActions successfully
// completes then ErrBuildActionsNotReady is returned. // completes then ErrBuildActionsNotReady is returned.
func (c *Context) WriteBuildFile(w StringWriterWriter) error { func (c *Context) WriteBuildFile(w StringWriterWriter, shardNinja bool, ninjaFileName string) error {
var err error var err error
pprof.Do(c.Context, pprof.Labels("blueprint", "WriteBuildFile"), func(ctx context.Context) { pprof.Do(c.Context, pprof.Labels("blueprint", "WriteBuildFile"), func(ctx context.Context) {
if !c.buildActionsReady { if !c.buildActionsReady {
@ -4204,7 +4208,7 @@ func (c *Context) WriteBuildFile(w StringWriterWriter) error {
return return
} }
if err = c.writeAllModuleActions(nw); err != nil { if err = c.writeAllModuleActions(nw, shardNinja, ninjaFileName); err != nil {
return return
} }
@ -4473,14 +4477,19 @@ func (s moduleSorter) Swap(i, j int) {
s.modules[i], s.modules[j] = s.modules[j], s.modules[i] s.modules[i], s.modules[j] = s.modules[j], s.modules[i]
} }
func (c *Context) writeAllModuleActions(nw *ninjaWriter) error { func GetNinjaShardFiles(ninjaFile string) []string {
ninjaShardCnt := 10
fileNames := make([]string, ninjaShardCnt)
for i := 0; i < ninjaShardCnt; i++ {
fileNames[i] = fmt.Sprintf("%s.%d", ninjaFile, i)
}
return fileNames
}
func (c *Context) writeAllModuleActions(nw *ninjaWriter, shardNinja bool, ninjaFileName string) error {
c.BeginEvent("modules") c.BeginEvent("modules")
defer c.EndEvent("modules") defer c.EndEvent("modules")
headerTemplate := template.New("moduleHeader")
if _, err := headerTemplate.Parse(moduleHeaderTemplate); err != nil {
// This is a programming error.
panic(err)
}
modules := make([]*moduleInfo, 0, len(c.moduleInfo)) modules := make([]*moduleInfo, 0, len(c.moduleInfo))
for _, module := range c.moduleInfo { for _, module := range c.moduleInfo {
@ -4493,6 +4502,57 @@ func (c *Context) writeAllModuleActions(nw *ninjaWriter) error {
return err return err
} }
headerTemplate := template.New("moduleHeader")
if _, err := headerTemplate.Parse(moduleHeaderTemplate); err != nil {
// This is a programming error.
panic(err)
}
if shardNinja {
errorCh := make(chan error)
fileNames := GetNinjaShardFiles(ninjaFileName)
shardedModules := proptools.ShardByCount(modules, len(fileNames))
ninjaShardCnt := len(shardedModules)
for i, batchModules := range shardedModules {
go func() {
f, err := os.OpenFile(filepath.Join(c.SrcDir(), fileNames[i]), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, OutFilePermissions)
if err != nil {
errorCh <- fmt.Errorf("error opening Ninja file: %s", err)
return
}
defer f.Close()
buf := bufio.NewWriterSize(f, 16*1024*1024)
defer buf.Flush()
writer := newNinjaWriter(buf)
errorCh <- c.writeModuleAction(batchModules, writer, headerTemplate)
}()
nw.Subninja(fileNames[i])
}
if ninjaShardCnt > 0 {
afterCh := time.After(60 * time.Second)
count := 1
for {
select {
case err := <-errorCh:
if err != nil {
return err
} else if count == ninjaShardCnt {
return nil
}
count++
case <-afterCh:
return fmt.Errorf("timed out when writing ninja file")
}
}
}
return nil
} else {
return c.writeModuleAction(modules, nw, headerTemplate)
}
}
func (c *Context) writeModuleAction(modules []*moduleInfo, nw *ninjaWriter, headerTemplate *template.Template) error {
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
for _, module := range modules { for _, module := range modules {

2
go.mod
View file

@ -1,3 +1,3 @@
module github.com/google/blueprint module github.com/google/blueprint
go 1.20 go 1.21

25
proptools/utils.go Normal file
View file

@ -0,0 +1,25 @@
package proptools
import (
"math"
)
func ShardBySize[T ~[]E, E any](toShard T, shardSize int) []T {
if len(toShard) == 0 {
return nil
}
ret := make([]T, 0, (len(toShard)+shardSize-1)/shardSize)
for len(toShard) > shardSize {
ret = append(ret, toShard[0:shardSize])
toShard = toShard[shardSize:]
}
if len(toShard) > 0 {
ret = append(ret, toShard)
}
return ret
}
func ShardByCount[T ~[]E, E any](toShard T, shardCount int) []T {
return ShardBySize(toShard, int(math.Ceil(float64(len(toShard))/float64(shardCount))))
}