Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 036b5a3e authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Fix possible race condition 

Test: m
Bug: 271526845
Change-Id: I8b8d57c45d9be3b538422588521bcfd85b61aa56
parent f4f03435

cmd/soong_ui/main.go

+9 −8
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ func main() { 


	// Create a new Status instance, which manages action counts and event output channels.

	stat := &status.Status{}

	defer stat.Finish()



	// Hook up the terminal output and tracer to Status.

	stat.AddOutput(output)

	stat.AddOutput(trace.StatusTracer())
@@ -221,13 +221,14 @@ func main() { 


	trace.SetOutput(filepath.Join(logsDir, c.logsPrefix+"build.trace"))



	defer func() {

		stat.Finish()

		criticalPath.WriteToMetrics(met)

		met.Dump(soongMetricsFile)

		if !config.SkipMetricsUpload() {

		defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, bazelProfileFile, bazelMetricsFile, metricsFiles...)

			build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, bazelProfileFile, bazelMetricsFile, metricsFiles...)

		}

	defer met.Dump(soongMetricsFile)

	// Should run before Metric.Dump

	defer criticalPath.WriteToMetrics(met)



	}()

	c.run(buildCtx, config, args)



}