Skip to content

Commit 03ff595

Browse files
LalitMagantiLalitMaganti
committed
Amalgamated source for v51.1
1 parent c5f468f commit 03ff595

File tree

2 files changed

+108
-9
lines changed

2 files changed

+108
-9
lines changed

‎sdk/perfetto.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31938,7 +31938,7 @@ void TrackEvent_LegacyEvent::Serialize(::protozero::Message* msg) const {
3193831938
// Intentionally empty (crbug.com/998165)
3193931939
// gen_amalgamated begin source: gen/protos/perfetto/trace/generic_kernel/generic_power.pbzero.cc
3194031940
// Intentionally empty (crbug.com/998165)
31941-
// gen_amalgamated begin source: gen/protos/perfetto/trace/generic_kernel/generic_task_state.pbzero.cc
31941+
// gen_amalgamated begin source: gen/protos/perfetto/trace/generic_kernel/generic_task.pbzero.cc
3194231942
// Intentionally empty (crbug.com/998165)
3194331943
// gen_amalgamated begin source: gen/protos/perfetto/trace/perfetto/perfetto_metatrace.pbzero.cc
3194431944
// Intentionally empty (crbug.com/998165)
@@ -42367,8 +42367,8 @@ void TrackEventInternal::EnableRegistry(
4236742367
uint32_t internal_instance_index) {
4236842368
for (size_t i = 0; i < registry->category_count(); i++) {
4236942369
if (IsCategoryEnabled(*registry, config, *registry->GetCategory(i))) {
42370-
PERFETTO_DLOG("EnableRegistry %" PRIu32 " %" PRIu64,
42371-
internal_instance_index, i);
42370+
PERFETTO_DLOG("EnableRegistry %" PRIu32 " %zu", internal_instance_index,
42371+
i);
4237242372
registry->EnableCategoryForInstance(i, internal_instance_index);
4237342373
}
4237442374
}
@@ -44792,8 +44792,8 @@ const char* GetVersionCode();
4479244792
#ifndef GEN_PERFETTO_VERSION_GEN_H_
4479344793
#define GEN_PERFETTO_VERSION_GEN_H_
4479444794

44795-
#define PERFETTO_VERSION_STRING() "v51.0-8eb032e80"
44796-
#define PERFETTO_VERSION_SCM_REVISION() "8eb032e80a9442fe18c90c6ea01f641db63c0868"
44795+
#define PERFETTO_VERSION_STRING() "v51.1-c5f468f2f"
44796+
#define PERFETTO_VERSION_SCM_REVISION() "c5f468f2f1d55817df1841645c45e9603d659b7a"
4479744797

4479844798
#endif // GEN_PERFETTO_VERSION_GEN_H_
4479944799
/*

‎sdk/perfetto.h‎

Lines changed: 103 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10111,6 +10111,7 @@ class FrameTimelineEvent;
1011110111
class FtraceEventBundle;
1011210112
class FtraceStats;
1011310113
class GenericKernelCpuFrequencyEvent;
10114+
class GenericKernelTaskRenameEvent;
1011410115
class GenericKernelTaskStateEvent;
1011510116
class GpuCounterEvent;
1011610117
class GpuLog;
@@ -10383,6 +10384,8 @@ class TracePacket_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID
1038310384
::protozero::ConstBytes generic_kernel_task_state_event() const { return at<117>().as_bytes(); }
1038410385
bool has_generic_kernel_cpu_freq_event() const { return at<118>().valid(); }
1038510386
::protozero::ConstBytes generic_kernel_cpu_freq_event() const { return at<118>().as_bytes(); }
10387+
bool has_generic_kernel_task_rename_event() const { return at<120>().valid(); }
10388+
::protozero::ConstBytes generic_kernel_task_rename_event() const { return at<120>().as_bytes(); }
1038610389
bool has_cpu_per_uid_data() const { return at<119>().valid(); }
1038710390
::protozero::ConstBytes cpu_per_uid_data() const { return at<119>().as_bytes(); }
1038810391
bool has_for_testing() const { return at<900>().valid(); }
@@ -10498,6 +10501,7 @@ class TracePacket : public ::protozero::Message {
1049810501
kAppWakelockBundleFieldNumber = 116,
1049910502
kGenericKernelTaskStateEventFieldNumber = 117,
1050010503
kGenericKernelCpuFreqEventFieldNumber = 118,
10504+
kGenericKernelTaskRenameEventFieldNumber = 120,
1050110505
kCpuPerUidDataFieldNumber = 119,
1050210506
kForTestingFieldNumber = 900,
1050310507
kTrustedUidFieldNumber = 3,
@@ -11740,6 +11744,20 @@ class TracePacket : public ::protozero::Message {
1174011744
}
1174111745

1174211746

11747+
using FieldMetadata_GenericKernelTaskRenameEvent =
11748+
::protozero::proto_utils::FieldMetadata<
11749+
120,
11750+
::protozero::proto_utils::RepetitionType::kNotRepeated,
11751+
::protozero::proto_utils::ProtoSchemaType::kMessage,
11752+
GenericKernelTaskRenameEvent,
11753+
TracePacket>;
11754+
11755+
static constexpr FieldMetadata_GenericKernelTaskRenameEvent kGenericKernelTaskRenameEvent{};
11756+
template <typename T = GenericKernelTaskRenameEvent> T* set_generic_kernel_task_rename_event() {
11757+
return BeginNestedMessage<T>(120);
11758+
}
11759+
11760+
1174311761
using FieldMetadata_CpuPerUidData =
1174411762
::protozero::proto_utils::FieldMetadata<
1174511763
119,
@@ -155015,11 +155033,11 @@ class GenericKernelCpuFrequencyEvent : public ::protozero::Message {
155015155033
} // Namespace.
155016155034
} // Namespace.
155017155035
#endif // Include guard.
155018-
// gen_amalgamated begin header: gen/protos/perfetto/trace/generic_kernel/generic_task_state.pbzero.h
155036+
// gen_amalgamated begin header: gen/protos/perfetto/trace/generic_kernel/generic_task.pbzero.h
155019155037
// Autogenerated by the ProtoZero compiler plugin. DO NOT EDIT.
155020155038

155021-
#ifndef PERFETTO_PROTOS_PROTOS_PERFETTO_TRACE_GENERIC_KERNEL_GENERIC_TASK_STATE_PROTO_H_
155022-
#define PERFETTO_PROTOS_PROTOS_PERFETTO_TRACE_GENERIC_KERNEL_GENERIC_TASK_STATE_PROTO_H_
155039+
#ifndef PERFETTO_PROTOS_PROTOS_PERFETTO_TRACE_GENERIC_KERNEL_GENERIC_TASK_PROTO_H_
155040+
#define PERFETTO_PROTOS_PROTOS_PERFETTO_TRACE_GENERIC_KERNEL_GENERIC_TASK_PROTO_H_
155023155041

155024155042
#include <stddef.h>
155025155043
#include <stdint.h>
@@ -155098,6 +155116,70 @@ const char* GenericKernelTaskStateEvent_TaskStateEnum_Name(::perfetto::protos::p
155098155116
return "PBZERO_UNKNOWN_ENUM_VALUE";
155099155117
}
155100155118

155119+
class GenericKernelTaskRenameEvent_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2, /*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
155120+
public:
155121+
GenericKernelTaskRenameEvent_Decoder(const uint8_t* data, size_t len) : TypedProtoDecoder(data, len) {}
155122+
explicit GenericKernelTaskRenameEvent_Decoder(const std::string& raw) : TypedProtoDecoder(reinterpret_cast<const uint8_t*>(raw.data()), raw.size()) {}
155123+
explicit GenericKernelTaskRenameEvent_Decoder(const ::protozero::ConstBytes& raw) : TypedProtoDecoder(raw.data, raw.size) {}
155124+
bool has_tid() const { return at<1>().valid(); }
155125+
int64_t tid() const { return at<1>().as_int64(); }
155126+
bool has_comm() const { return at<2>().valid(); }
155127+
::protozero::ConstChars comm() const { return at<2>().as_string(); }
155128+
};
155129+
155130+
class GenericKernelTaskRenameEvent : public ::protozero::Message {
155131+
public:
155132+
using Decoder = GenericKernelTaskRenameEvent_Decoder;
155133+
enum : int32_t {
155134+
kTidFieldNumber = 1,
155135+
kCommFieldNumber = 2,
155136+
};
155137+
static constexpr const char* GetName() { return ".perfetto.protos.GenericKernelTaskRenameEvent"; }
155138+
155139+
155140+
using FieldMetadata_Tid =
155141+
::protozero::proto_utils::FieldMetadata<
155142+
1,
155143+
::protozero::proto_utils::RepetitionType::kNotRepeated,
155144+
::protozero::proto_utils::ProtoSchemaType::kInt64,
155145+
int64_t,
155146+
GenericKernelTaskRenameEvent>;
155147+
155148+
static constexpr FieldMetadata_Tid kTid{};
155149+
void set_tid(int64_t value) {
155150+
static constexpr uint32_t field_id = FieldMetadata_Tid::kFieldId;
155151+
// Call the appropriate protozero::Message::Append(field_id, ...)
155152+
// method based on the type of the field.
155153+
::protozero::internal::FieldWriter<
155154+
::protozero::proto_utils::ProtoSchemaType::kInt64>
155155+
::Append(*this, field_id, value);
155156+
}
155157+
155158+
using FieldMetadata_Comm =
155159+
::protozero::proto_utils::FieldMetadata<
155160+
2,
155161+
::protozero::proto_utils::RepetitionType::kNotRepeated,
155162+
::protozero::proto_utils::ProtoSchemaType::kString,
155163+
std::string,
155164+
GenericKernelTaskRenameEvent>;
155165+
155166+
static constexpr FieldMetadata_Comm kComm{};
155167+
void set_comm(const char* data, size_t size) {
155168+
AppendBytes(FieldMetadata_Comm::kFieldId, data, size);
155169+
}
155170+
void set_comm(::protozero::ConstChars chars) {
155171+
AppendBytes(FieldMetadata_Comm::kFieldId, chars.data, chars.size);
155172+
}
155173+
void set_comm(std::string value) {
155174+
static constexpr uint32_t field_id = FieldMetadata_Comm::kFieldId;
155175+
// Call the appropriate protozero::Message::Append(field_id, ...)
155176+
// method based on the type of the field.
155177+
::protozero::internal::FieldWriter<
155178+
::protozero::proto_utils::ProtoSchemaType::kString>
155179+
::Append(*this, field_id, value);
155180+
}
155181+
};
155182+
155101155183
class GenericKernelTaskStateEvent_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/5, /*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
155102155184
public:
155103155185
GenericKernelTaskStateEvent_Decoder(const uint8_t* data, size_t len) : TypedProtoDecoder(data, len) {}
@@ -158134,7 +158216,7 @@ class HeapGraph : public ::protozero::Message {
158134158216
}
158135158217
};
158136158218

158137-
class HeapGraphObject_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/9, /*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
158219+
class HeapGraphObject_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/10, /*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
158138158220
public:
158139158221
HeapGraphObject_Decoder(const uint8_t* data, size_t len) : TypedProtoDecoder(data, len) {}
158140158222
explicit HeapGraphObject_Decoder(const std::string& raw) : TypedProtoDecoder(reinterpret_cast<const uint8_t*>(raw.data()), raw.size()) {}
@@ -158157,6 +158239,8 @@ class HeapGraphObject_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIEL
158157158239
int64_t native_allocation_registry_size_field() const { return at<8>().as_int64(); }
158158158240
bool has_heap_type_delta() const { return at<9>().valid(); }
158159158241
int32_t heap_type_delta() const { return at<9>().as_int32(); }
158242+
bool has_runtime_internal_object_id() const { return at<10>().valid(); }
158243+
::protozero::PackedRepeatedFieldIterator<::protozero::proto_utils::ProtoWireType::kVarInt, uint64_t> runtime_internal_object_id(bool* parse_error_ptr) const { return GetPackedRepeated<::protozero::proto_utils::ProtoWireType::kVarInt, uint64_t>(10, parse_error_ptr); }
158160158244
};
158161158245

158162158246
class HeapGraphObject : public ::protozero::Message {
@@ -158172,6 +158256,7 @@ class HeapGraphObject : public ::protozero::Message {
158172158256
kReferenceObjectIdFieldNumber = 5,
158173158257
kNativeAllocationRegistrySizeFieldFieldNumber = 8,
158174158258
kHeapTypeDeltaFieldNumber = 9,
158259+
kRuntimeInternalObjectIdFieldNumber = 10,
158175158260
};
158176158261
static constexpr const char* GetName() { return ".perfetto.protos.HeapGraphObject"; }
158177158262

@@ -158338,6 +158423,20 @@ class HeapGraphObject : public ::protozero::Message {
158338158423
::protozero::proto_utils::ProtoSchemaType::kEnum>
158339158424
::Append(*this, field_id, value);
158340158425
}
158426+
158427+
using FieldMetadata_RuntimeInternalObjectId =
158428+
::protozero::proto_utils::FieldMetadata<
158429+
10,
158430+
::protozero::proto_utils::RepetitionType::kRepeatedPacked,
158431+
::protozero::proto_utils::ProtoSchemaType::kUint64,
158432+
uint64_t,
158433+
HeapGraphObject>;
158434+
158435+
static constexpr FieldMetadata_RuntimeInternalObjectId kRuntimeInternalObjectId{};
158436+
void set_runtime_internal_object_id(const ::protozero::PackedVarInt& packed_buffer) {
158437+
AppendBytes(FieldMetadata_RuntimeInternalObjectId::kFieldId, packed_buffer.data(),
158438+
packed_buffer.size());
158439+
}
158341158440
};
158342158441

158343158442
class HeapGraphType_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/8, /*HAS_NONPACKED_REPEATED_FIELDS=*/false> {

0 commit comments

Comments
 (0)