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

Merge "Add status messages for RBE and product config"

Browse Source
This commit is contained in:
Cole Faust
2023-02-17 07:55:40 +00:00
committed by Gerrit Code Review
parent af8b950357 64955b32bf
commit d75b47add9
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ui/build/dumpvars.go
View File

@@ -84,6 +84,14 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_
ctx.BeginTrace(metrics.RunKati, "dumpvars") ctx.BeginTrace(metrics.RunKati, "dumpvars")
defer ctx.EndTrace() defer ctx.EndTrace()
tool := ctx.Status.StartTool()
if write_soong_vars {
// only print this when write_soong_vars is true so that it's not printed when using
// the get_build_var command.
tool.Status("Running product configuration...")
}
defer tool.Finish()
cmd := Command(ctx, config, "dumpvars", cmd := Command(ctx, config, "dumpvars",
config.PrebuiltBuildTool("ckati"), config.PrebuiltBuildTool("ckati"),
"-f", "build/make/core/config.mk", "-f", "build/make/core/config.mk",
@@ -108,7 +116,7 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_
} }
cmd.StartOrFatal() cmd.StartOrFatal()
// TODO: error out when Stderr contains any content // TODO: error out when Stderr contains any content
status.KatiReader(ctx.Status.StartTool(), pipe) status.KatiReader(tool, pipe)
cmd.WaitOrFatal() cmd.WaitOrFatal()
ret := make(map[string]string, len(vars)) ret := make(map[string]string, len(vars))

4
ui/build/rbe.go
View File

@@ -100,6 +100,8 @@ func startRBE(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunSetupTool, "rbe_bootstrap") ctx.BeginTrace(metrics.RunSetupTool, "rbe_bootstrap")
defer ctx.EndTrace() defer ctx.EndTrace()
ctx.Status.Status("Starting rbe...")
if u := ulimitOrFatal(ctx, config, "-u"); u < rbeLeastNProcs { if u := ulimitOrFatal(ctx, config, "-u"); u < rbeLeastNProcs {
ctx.Fatalf("max user processes is insufficient: %d; want >= %d.\n", u, rbeLeastNProcs) ctx.Fatalf("max user processes is insufficient: %d; want >= %d.\n", u, rbeLeastNProcs)
} }
@@ -180,6 +182,8 @@ func DumpRBEMetrics(ctx Context, config Config, filename string) {
return return
} }
ctx.Status.Status("Dumping rbe metrics...")
outputDir := config.rbeProxyLogsDir() outputDir := config.rbeProxyLogsDir()
if outputDir == "" { if outputDir == "" {
ctx.Fatal("RBE output dir variable not defined. Aborting metrics dumping.") ctx.Fatal("RBE output dir variable not defined. Aborting metrics dumping.")