StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "minor refactor ui/build/ninja.go"

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-17 02:07:51 +00:00
committed by Gerrit Code Review
parent 9433998d9a 96d6227999
commit f77df19cb8
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ui/build/ninja.go
View File

@@ -31,10 +31,11 @@ import (
const ( const (
// File containing the environment state when ninja is executed // File containing the environment state when ninja is executed
ninjaEnvFileName = "ninja.environment" ninjaEnvFileName = "ninja.environment"
ninjaLogFileName = ".ninja_log"
) )
func useNinjaBuildLog(ctx Context, config Config, cmd *Cmd) { func useNinjaBuildLog(ctx Context, config Config, cmd *Cmd) {
ninjaLogFile := filepath.Join(config.OutDir(), ".ninja_log") ninjaLogFile := filepath.Join(config.OutDir(), ninjaLogFileName)
data, err := os.ReadFile(ninjaLogFile) data, err := os.ReadFile(ninjaLogFile)
var outputBuilder strings.Builder var outputBuilder strings.Builder
if err == nil { if err == nil {
@@ -59,9 +60,11 @@ func useNinjaBuildLog(ctx Context, config Config, cmd *Cmd) {
outputBuilder.WriteString(",") outputBuilder.WriteString(",")
outputBuilder.WriteString(strconv.Itoa(end-start+1) + "\n") outputBuilder.WriteString(strconv.Itoa(end-start+1) + "\n")
} }
} else {
// If there is no ninja log file, just pass empty ninja weight list.
// Because it is still efficient with critical path calculation logic even without weight.
ctx.Verbosef("There is an error during reading ninja log, so ninja will use empty weight list: %s", err)
} }
// If there is no ninja log file, just pass empty ninja weight list.
// Because it is still efficient with critical path calculation logic even without weight.
weightListFile := filepath.Join(config.OutDir(), ".ninja_weight_list") weightListFile := filepath.Join(config.OutDir(), ".ninja_weight_list")
@@ -263,7 +266,7 @@ func runNinjaForBuild(ctx Context, config Config) {
ticker := time.NewTicker(ninjaHeartbeatDuration) ticker := time.NewTicker(ninjaHeartbeatDuration)
defer ticker.Stop() defer ticker.Stop()
ninjaChecker := &ninjaStucknessChecker{ ninjaChecker := &ninjaStucknessChecker{
logPath: filepath.Join(config.OutDir(), ".ninja_log"), logPath: filepath.Join(config.OutDir(), ninjaLogFileName),
} }
go func() { go func() {
for { for {