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

Merge "Fix possible race condition"

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-23 15:35:00 +00:00
committed by Gerrit Code Review
parent 78d15f2b74 036b5a3ed3
commit 401a1cf0c3
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/soong_ui/main.go
View File

@@ -169,7 +169,7 @@ func main() {
// Create a new Status instance, which manages action counts and event output channels. // Create a new Status instance, which manages action counts and event output channels.
stat := &status.Status{} stat := &status.Status{}
defer stat.Finish()
// Hook up the terminal output and tracer to Status. // Hook up the terminal output and tracer to Status.
stat.AddOutput(output) stat.AddOutput(output)
stat.AddOutput(trace.StatusTracer()) stat.AddOutput(trace.StatusTracer())
@@ -221,13 +221,14 @@ func main() {
trace.SetOutput(filepath.Join(logsDir, c.logsPrefix+"build.trace")) trace.SetOutput(filepath.Join(logsDir, c.logsPrefix+"build.trace"))
if !config.SkipMetricsUpload() { defer func() {
defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, bazelProfileFile, bazelMetricsFile, metricsFiles...) stat.Finish()
} criticalPath.WriteToMetrics(met)
defer met.Dump(soongMetricsFile) met.Dump(soongMetricsFile)
// Should run before Metric.Dump if !config.SkipMetricsUpload() {
defer criticalPath.WriteToMetrics(met) build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, bazelProfileFile, bazelMetricsFile, metricsFiles...)
}
}()
c.run(buildCtx, config, args) c.run(buildCtx, config, args)
} }