diff options
| author | Primiano Tucci <primiano@google.com> | 2021-06-22 21:34:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 21:34:49 +0000 |
| commit | 4023adb80ae81b97ef229a3fe56b4b9eb4662c8c (patch) | |
| tree | c2dfcf5c81c26d472bc2368d6557811c7fe5c903 | |
| parent | e51f43aa9d45aada2f7821511c2c4bc33fe47cee (diff) | |
| parent | 6cb33202effc522579521ab5ff5fcabed550887a (diff) | |
| download | perfetto-4023adb80ae81b97ef229a3fe56b4b9eb4662c8c.tar.gz | |
perfetto_cmd: move go/trace-uuid print after incidentd checks am: 6cb33202ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/perfetto/+/15059759
Change-Id: I8ed00b0d53552839644ae5a3382af18ec108de45
| -rw-r--r-- | src/perfetto_cmd/perfetto_cmd.cc | 4 | ||||
| -rw-r--r-- | src/perfetto_cmd/perfetto_cmd_android.cc | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/perfetto_cmd/perfetto_cmd.cc b/src/perfetto_cmd/perfetto_cmd.cc index 526139d06..449f1f570 100644 --- a/src/perfetto_cmd/perfetto_cmd.cc +++ b/src/perfetto_cmd/perfetto_cmd.cc @@ -903,10 +903,6 @@ void PerfettoCmd::FinalizeTraceAndExit() { } if (save_to_incidentd_) { - if (!uuid_.empty()) { - base::Uuid uuid(uuid_); - PERFETTO_LOG("go/trace-uuid/%s", uuid.ToPrettyString().c_str()); - } #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) SaveTraceIntoDropboxAndIncidentOrCrash(); #endif diff --git a/src/perfetto_cmd/perfetto_cmd_android.cc b/src/perfetto_cmd/perfetto_cmd_android.cc index fe2572cc2..d64fe85cb 100644 --- a/src/perfetto_cmd/perfetto_cmd_android.cc +++ b/src/perfetto_cmd/perfetto_cmd_android.cc @@ -48,6 +48,12 @@ void PerfettoCmd::SaveTraceIntoDropboxAndIncidentOrCrash() { // Save the trace as an incident. SaveOutputToIncidentTraceOrCrash(); + if (!uuid_.empty()) { + base::Uuid uuid(uuid_); + PERFETTO_LOG("go/trace-uuid/%s (%" PRIu64 " bytes)", + uuid.ToPrettyString().c_str(), bytes_written_); + } + // Ask incidentd to create a report, which will read the file we just // wrote. const auto& cfg = trace_config_->incident_report_config(); |