[tp] formatting fixes
diff --git a/include/perfetto/trace_processor/trace_processor.h b/include/perfetto/trace_processor/trace_processor.h index 163376b..0e67003 100644 --- a/include/perfetto/trace_processor/trace_processor.h +++ b/include/perfetto/trace_processor/trace_processor.h
@@ -79,11 +79,12 @@ // This allows the Perfetto UI to provide file descriptor sets at // runtime, enabling the parsing of custom protobuf messages not known at // compile time, such as new statsd atoms. - + // This is needed because the main descriptor pool will only get // updated with Android quarterly updates and this new descriptor // set can be modified any time in google3 - virtual base::Status ExtendDescriptorPool(const uint8_t* data, size_t size) = 0; + virtual base::Status ExtendDescriptorPool(const uint8_t* data, + size_t size) = 0; // ================================================================= // | Trace summary related functionality starts here |
diff --git a/src/trace_processor/importers/proto/statsd_module.cc b/src/trace_processor/importers/proto/statsd_module.cc index aadf11a..dea96b6 100644 --- a/src/trace_processor/importers/proto/statsd_module.cc +++ b/src/trace_processor/importers/proto/statsd_module.cc
@@ -114,8 +114,8 @@ context_(context), args_parser_(*context_->descriptor_pool_) { RegisterForField(TracePacket::kStatsdAtomFieldNumber); - context_->descriptor_pool_->AddFromFileDescriptorSet(kAtomsDescriptor.data(), - kAtomsDescriptor.size(),{},true); + context_->descriptor_pool_->AddFromFileDescriptorSet( + kAtomsDescriptor.data(), kAtomsDescriptor.size(), {}, true); } StatsdModule::~StatsdModule() = default; @@ -200,7 +200,7 @@ } const auto& descriptor = context_->descriptor_pool_->descriptors()[*desc_idx]; - + const auto& field_it = descriptor.fields().find(nested_field_id); base::Status status; @@ -264,7 +264,8 @@ std::optional<uint32_t> StatsdModule::GetAtomDescriptorIdx() { if (!descriptor_idx_) { - descriptor_idx_ = context_->descriptor_pool_->FindDescriptorIdx(kAtomProtoName); + descriptor_idx_ = + context_->descriptor_pool_->FindDescriptorIdx(kAtomProtoName); } return descriptor_idx_; }
diff --git a/src/trace_processor/importers/proto/statsd_module.h b/src/trace_processor/importers/proto/statsd_module.h index 893322a..6607517 100644 --- a/src/trace_processor/importers/proto/statsd_module.h +++ b/src/trace_processor/importers/proto/statsd_module.h
@@ -57,7 +57,7 @@ StringId GetAtomName(uint32_t atom_field_id); TrackId InternTrackId(); std::optional<uint32_t> GetAtomDescriptorIdx(); - + TraceProcessorContext* context_; base::FlatHashMap<uint32_t, StringId> atom_names_; std::optional<uint32_t> descriptor_idx_;
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc index e2fdbac..49169b8 100644 --- a/src/trace_processor/trace_processor_impl.cc +++ b/src/trace_processor/trace_processor_impl.cc
@@ -596,10 +596,8 @@ base::Status TraceProcessorImpl::ExtendDescriptorPool(const uint8_t* data, size_t size) { - return context()->descriptor_pool_->AddFromFileDescriptorSet( - data, size, - {}, - true); + return context()->descriptor_pool_->AddFromFileDescriptorSet(data, size, {}, + true); } // =================================================================
diff --git a/src/trace_processor/trace_processor_impl.h b/src/trace_processor/trace_processor_impl.h index 1932816..ca06a17 100644 --- a/src/trace_processor/trace_processor_impl.h +++ b/src/trace_processor/trace_processor_impl.h
@@ -77,9 +77,8 @@ base::Status RegisterSqlPackage(SqlPackage) override; base::Status RegisterSqlModule(SqlModule module) override; - - base::Status ExtendDescriptorPool(const uint8_t* data, size_t size) override; + base::Status ExtendDescriptorPool(const uint8_t* data, size_t size) override; // ================================================================= // | Trace-based metrics (v2) related functionality starts here |