diff options
| author | 2024-01-18 03:59:30 +0000 | |
|---|---|---|
| committer | 2024-01-18 03:59:30 +0000 | |
| commit | 22c7b9bc6f3c16dc8c4f6ea5466915f8d3faf1ac (patch) | |
| tree | 58c47afda0b2b8d0491ee598d88af96152d165f0 | |
| parent | 2443732f31fa918e67988d7cd134b97869d82881 (diff) | |
| parent | 32bc0fa59b13e17d7c87101ab807cfa359c2a57d (diff) | |
Merge "dumpstate: Fix missing Java anr traces in bugreport" into main am: 86e25122da am: 32bc0fa59b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2907818
Change-Id: Ic824759c37632e2a0c2092d897a1f972195476fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 8 | ||||
| -rw-r--r-- | cmds/dumpstate/dumpstate.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 0bbd4a86ba..481c28ef6b 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -199,6 +199,7 @@ static const std::string TOMBSTONE_DIR = "/data/tombstones/"; static const std::string TOMBSTONE_FILE_PREFIX = "tombstone_"; static const std::string ANR_DIR = "/data/anr/"; static const std::string ANR_FILE_PREFIX = "anr_"; +static const std::string ANR_TRACE_FILE_PREFIX = "trace_"; static const std::string SHUTDOWN_CHECKPOINTS_DIR = "/data/system/shutdown-checkpoints/"; static const std::string SHUTDOWN_CHECKPOINTS_FILE_PREFIX = "checkpoints-"; @@ -1186,6 +1187,10 @@ static void AddAnrTraceDir(const std::string& anr_traces_dir) { } else { printf("*** NO ANRs to dump in %s\n\n", ANR_DIR.c_str()); } + + // Add Java anr traces (such as generated by the Finalizer Watchdog). + AddDumps(ds.anr_trace_data_.begin(), ds.anr_trace_data_.end(), "JAVA ANR TRACES", + true /* add_to_zip */); } static void AddAnrTraceFiles() { @@ -1904,6 +1909,7 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { if (!PropertiesHelper::IsDryRun()) { ds.tombstone_data_ = GetDumpFds(TOMBSTONE_DIR, TOMBSTONE_FILE_PREFIX); ds.anr_data_ = GetDumpFds(ANR_DIR, ANR_FILE_PREFIX); + ds.anr_trace_data_ = GetDumpFds(ANR_DIR, ANR_TRACE_FILE_PREFIX); ds.shutdown_checkpoints_ = GetDumpFds( SHUTDOWN_CHECKPOINTS_DIR, SHUTDOWN_CHECKPOINTS_FILE_PREFIX); } @@ -3064,6 +3070,7 @@ void Dumpstate::Cancel() { } tombstone_data_.clear(); anr_data_.clear(); + anr_trace_data_.clear(); shutdown_checkpoints_.clear(); // Instead of shutdown the pool, we delete temporary files directly since @@ -3364,6 +3371,7 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, tombstone_data_.clear(); anr_data_.clear(); + anr_trace_data_.clear(); shutdown_checkpoints_.clear(); return (consent_callback_ != nullptr && diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h index 20b28656ce..46d949e303 100644 --- a/cmds/dumpstate/dumpstate.h +++ b/cmds/dumpstate/dumpstate.h @@ -526,6 +526,9 @@ class Dumpstate { // List of open ANR dump files. std::vector<DumpData> anr_data_; + // List of open Java traces files in the anr directory. + std::vector<DumpData> anr_trace_data_; + // List of open shutdown checkpoint files. std::vector<DumpData> shutdown_checkpoints_; |