commit 5658705848816085088544c45bda34327257c38e
author Lalit Maganti <lalitm@google.com> Tue Oct 15 16:05:01 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 15 16:05:01 2024 +0000
tree 7a31f4877631b8c77ffc261b220f5ed5683e5027
parent 0bc1457218a12273a03e77f57d12553b1e95896a
parent 67c32eada5f6d9117b57f0e7814c59d8242956a5

Merge "tp: don't parse V8 events if JSON parser is not available" into main

src/trace_processor/forwarding_trace_parser.cc

diff --git a/src/trace_processor/forwarding_trace_parser.cc b/src/trace_processor/forwarding_trace_parser.cc
index 2e61c99..2bf7958 100644
--- a/src/trace_processor/forwarding_trace_parser.cc
+++ b/src/trace_processor/forwarding_trace_parser.cc
@@ -92,7 +92,7 @@
                                              tables::TraceFileTable::Id id)
     : context_(context), file_id_(id) {}
 
-ForwardingTraceParser::~ForwardingTraceParser() {}
+ForwardingTraceParser::~ForwardingTraceParser() = default;
 
 base::Status ForwardingTraceParser::Init(const TraceBlobView& blob) {
   PERFETTO_CHECK(!reader_);
@@ -107,15 +107,9 @@
     // The UI's error_dialog.ts uses it to make the dialog more graceful.
     return base::ErrStatus("Unknown trace type provided (ERR:fmt)");
   }
-
   context_->trace_file_tracker->StartParsing(file_id_, trace_type_);
-
-  base::StatusOr<std::unique_ptr<ChunkedTraceReader>> reader_or =
-      context_->reader_registry->CreateTraceReader(trace_type_);
-  if (!reader_or.ok()) {
-    return reader_or.status();
-  }
-  reader_ = std::move(*reader_or);
+  ASSIGN_OR_RETURN(reader_,
+                   context_->reader_registry->CreateTraceReader(trace_type_));
 
   PERFETTO_DLOG("%s trace detected", TraceTypeToString(trace_type_));
   UpdateSorterForTraceType(trace_type_);
@@ -126,7 +120,6 @@
   if (trace_type_ == kProtoTraceType || trace_type_ == kSystraceTraceType) {
     context_->process_tracker->SetPidZeroIsUpidZeroIdleProcess();
   }
-
   return base::OkStatus();
 }
 
@@ -181,12 +174,13 @@
 }
 
 base::Status ForwardingTraceParser::NotifyEndOfFile() {
-  base::Status status = base::OkStatus();
   if (reader_) {
-    status = reader_->NotifyEndOfFile();
+    RETURN_IF_ERROR(reader_->NotifyEndOfFile());
   }
-  context_->trace_file_tracker->DoneParsing(file_id_, trace_size_);
-  return status;
+  if (trace_type_ != kUnknownTraceType) {
+    context_->trace_file_tracker->DoneParsing(file_id_, trace_size_);
+  }
+  return base::OkStatus();
 }
 
 }  // namespace perfetto::trace_processor