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

rename parseOneAsync to openAndParse

Browse source 
Bug: 65683273
Test: build/soong/scripts/diff_build_graphs.sh \
      'build/blueprint:work^^^' 'build/blueprint:work'

Change-Id: I56e08716057c3746b01b7a5e43f0223ee1f940db
This commit is contained in:
Jeff Gaston 2017-12-05 14:57:58 -08:00
parent 14978f8f9d
commit 5800d046c1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
context.go
View file

@ -721,12 +721,12 @@ func (c *Context) WalkBlueprintsFiles(rootDir string, filePaths []string,
} }
blueprintsSet := make(map[string]bool) blueprintsSet := make(map[string]bool)
// Channels to receive data back from parseOneAsync goroutines // Channels to receive data back from openAndParse goroutines
blueprintsCh := make(chan fileParseContext) blueprintsCh := make(chan fileParseContext)
errsCh := make(chan []error) errsCh := make(chan []error)
depsCh := make(chan string) depsCh := make(chan string)
// Channel to notify main loop that a parseOneAsync goroutine has finished // Channel to notify main loop that a openAndParse goroutine has finished
doneParsingCh := make(chan fileParseContext) doneParsingCh := make(chan fileParseContext)
// Number of outstanding goroutines to wait for // Number of outstanding goroutines to wait for
@ -750,7 +750,7 @@ func (c *Context) WalkBlueprintsFiles(rootDir string, filePaths []string,
deps = append(deps, blueprint.fileName) deps = append(deps, blueprint.fileName)
visitorWaitGroup.Add(1) visitorWaitGroup.Add(1)
go func() { go func() {
file := c.parseOneAsync(blueprint.fileName, blueprint.Scope, rootDir, file := c.openAndParse(blueprint.fileName, blueprint.Scope, rootDir,
errsCh, blueprintsCh, depsCh, &blueprint) errsCh, blueprintsCh, depsCh, &blueprint)
doneParsingCh <- blueprint doneParsingCh <- blueprint
@ -854,13 +854,13 @@ func (c *Context) MockFileSystem(files map[string][]byte) {
c.fs = pathtools.MockFs(files) c.fs = pathtools.MockFs(files)
} }
// parseOneAsync parses a single Blueprints file, and sends results through the provided channels // openAndParse parses a single Blueprints file, and sends results through the provided channels
// //
// Errors are returned through errsCh. // Errors are returned through errsCh.
// Any defined modules are returned through modulesCh. // Any defined modules are returned through modulesCh.
// Any sub-Blueprints files are returned through blueprintsCh. // Any sub-Blueprints files are returned through blueprintsCh.
// Any dependencies on Blueprints files or directories are returned through depsCh. // Any dependencies on Blueprints files or directories are returned through depsCh.
func (c *Context) parseOneAsync(filename string, scope *parser.Scope, rootDir string, func (c *Context) openAndParse(filename string, scope *parser.Scope, rootDir string,
errsCh chan<- []error, blueprintsCh chan<- fileParseContext, errsCh chan<- []error, blueprintsCh chan<- fileParseContext,
depsCh chan<- string, parent *fileParseContext) (file *parser.File) { depsCh chan<- string, parent *fileParseContext) (file *parser.File) {