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

Merge "Improve soong stuck ninja detection output" into main

Browse Source
This commit is contained in:
Colin Cross
2024-01-11 18:01:57 +00:00
committed by Gerrit Code Review
parent e92e561460 a9aa35c252
commit 4593e41ba6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/build/ninja.go
View File

@@ -271,11 +271,13 @@ func (c *ninjaStucknessChecker) check(ctx Context, config Config) {
// The Ninja file hasn't been modified since the last time it was // The Ninja file hasn't been modified since the last time it was
// checked, so Ninja could be stuck. Output some diagnostics. // checked, so Ninja could be stuck. Output some diagnostics.
ctx.Verbosef("ninja may be stuck; last update to %v was %v. dumping process tree...", c.logPath, newModTime) ctx.Verbosef("ninja may be stuck; last update to %v was %v. dumping process tree...", c.logPath, newModTime)
ctx.Printf("ninja may be stuck, check %v for list of running processes.",
filepath.Join(config.LogsDir(), config.logsPrefix+"soong.log"))
// The "pstree" command doesn't exist on Mac, but "pstree" on Linux // The "pstree" command doesn't exist on Mac, but "pstree" on Linux
// gives more convenient output than "ps" So, we try pstree first, and // gives more convenient output than "ps" So, we try pstree first, and
// ps second // ps second
commandText := fmt.Sprintf("pstree -pal %v || ps -ef", os.Getpid()) commandText := fmt.Sprintf("pstree -palT %v || ps -ef", os.Getpid())
cmd := Command(ctx, config, "dump process tree", "bash", "-c", commandText) cmd := Command(ctx, config, "dump process tree", "bash", "-c", commandText)
output := cmd.CombinedOutputOrFatal() output := cmd.CombinedOutputOrFatal()