Downgrade Perfetto to 13ce0c9e13b0940d2476cd0cff2301708a9a2e2b

Most recent Perfetto is causing headaches in Dart to Flutter roll.

Change-Id: Ic5aa9905dea6dd292f354c0586a61c686a6a6964
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/483920
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Slava Egorov <vegorov@google.com>
This commit is contained in:
Slava Egorov
2026-02-26 12:18:08 -08:00
committed by Commit Queue
parent 72d87adf69
commit 6a6e96fc2a
12 changed files with 75 additions and 93 deletions
+1 -1
View File
@@ -114,7 +114,7 @@ vars = {
"libcxxabi_rev": "a4dda1589d37a7e4b4f7a81ebad01b1083f2e726",
"libc_rev": "5af39a19a1ad51ce93972cdab206dcd3ff9b6afa",
"markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
"perfetto_rev": "49c59636465f2a32f4d83cff835538ba7bf8d732",
"perfetto_rev": "13ce0c9e13b0940d2476cd0cff2301708a9a2e2b",
"ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
"WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c",
"zlib_rev": "470d3a2ee4ef721688ce6961bc865a99fcb64070",
@@ -23,18 +23,13 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class ClockSnapshot_Clock;
enum BuiltinClock : int32_t;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
class ClockSnapshot_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
class ClockSnapshot_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
ClockSnapshot_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -82,11 +77,11 @@ class ClockSnapshot : public ::protozero::Message {
2,
::protozero::proto_utils::RepetitionType::kNotRepeated,
::protozero::proto_utils::ProtoSchemaType::kEnum,
BuiltinClock,
::perfetto::protos::pbzero::BuiltinClock,
ClockSnapshot>;
static constexpr FieldMetadata_PrimaryTraceClock kPrimaryTraceClock{};
void set_primary_trace_clock(BuiltinClock value) {
void set_primary_trace_clock(::perfetto::protos::pbzero::BuiltinClock value) {
static constexpr uint32_t field_id =
FieldMetadata_PrimaryTraceClock::kFieldId;
// Call the appropriate protozero::Message::Append(field_id, ...)
@@ -99,7 +94,9 @@ class ClockSnapshot : public ::protozero::Message {
};
class ClockSnapshot_Clock_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
: public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
ClockSnapshot_Clock_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -23,6 +23,7 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class Callstack;
class DebugAnnotationName;
class EventCategory;
@@ -30,16 +31,10 @@ class EventName;
class Frame;
class InternedString;
class Mapping;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
class InternedData_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/29> {
class InternedData_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/29,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
InternedData_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -23,18 +23,13 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class AddressSymbols;
class Line;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
class Callstack_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
class Callstack_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
Callstack_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -99,8 +94,9 @@ class Callstack : public ::protozero::Message {
}
};
class Frame_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/4> {
class Frame_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/4,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
Frame_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -203,8 +199,9 @@ class Frame : public ::protozero::Message {
}
};
class Mapping_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/7> {
class Mapping_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/7,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
Mapping_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -351,8 +348,9 @@ class Mapping : public ::protozero::Message {
}
};
class ModuleSymbols_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/3> {
class ModuleSymbols_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/3,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
ModuleSymbols_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -446,8 +444,9 @@ class ModuleSymbols : public ::protozero::Message {
}
};
class AddressSymbols_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
class AddressSymbols_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
AddressSymbols_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -507,7 +506,9 @@ class AddressSymbols : public ::protozero::Message {
}
};
class Line_Decoder : public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/3> {
class Line_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/3,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
Line_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -603,8 +604,9 @@ class Line : public ::protozero::Message {
}
};
class InternedString_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
class InternedString_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
InternedString_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -24,8 +24,9 @@ namespace perfetto {
namespace protos {
namespace pbzero {
class PerfSample_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/4> {
class PerfSample_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/4,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
PerfSample_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
+4 -9
View File
@@ -23,17 +23,12 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class TracePacket;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
class Trace_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/1> {
class Trace_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/1,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
Trace_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -23,19 +23,13 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class ClockSnapshot;
class InternedData;
class ModuleSymbols;
class PerfSample;
class TrackDescriptor;
class TrackEvent;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
namespace perfetto_pbzero_enum_TracePacket {
enum SequenceFlags : int32_t {
@@ -70,8 +64,9 @@ const char* TracePacket_SequenceFlags_Name(
return "PBZERO_UNKNOWN_ENUM_VALUE";
}
class TracePacket_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/66> {
class TracePacket_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/66,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
TracePacket_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -25,7 +25,9 @@ namespace protos {
namespace pbzero {
class DebugAnnotationName_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
: public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
DebugAnnotationName_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -94,8 +96,9 @@ class DebugAnnotationName : public ::protozero::Message {
}
};
class DebugAnnotation_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/17> {
class DebugAnnotation_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/17,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
DebugAnnotation_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -24,8 +24,9 @@ namespace perfetto {
namespace protos {
namespace pbzero {
class ProcessDescriptor_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/6> {
class ProcessDescriptor_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/6,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
ProcessDescriptor_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -24,8 +24,9 @@ namespace perfetto {
namespace protos {
namespace pbzero {
class ThreadDescriptor_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/5> {
class ThreadDescriptor_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/5,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
ThreadDescriptor_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -23,18 +23,13 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class ProcessDescriptor;
class ThreadDescriptor;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
class TrackDescriptor_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/5> {
class TrackDescriptor_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/5,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
TrackDescriptor_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -23,18 +23,12 @@
namespace perfetto {
namespace protos {
namespace pbzero {
class DebugAnnotation;
namespace perfetto_pbzero_enum_TrackEvent {
enum Type : int32_t;
} // namespace perfetto_pbzero_enum_TrackEvent
using TrackEvent_Type = perfetto_pbzero_enum_TrackEvent::Type;
} // Namespace pbzero.
} // Namespace protos.
} // Namespace perfetto.
namespace perfetto {
namespace protos {
namespace pbzero {
namespace perfetto_pbzero_enum_TrackEvent {
enum Type : int32_t {
@@ -69,8 +63,9 @@ const char* TrackEvent_Type_Name(
return "PBZERO_UNKNOWN_ENUM_VALUE";
}
class EventName_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
class EventName_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
EventName_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -139,8 +134,9 @@ class EventName : public ::protozero::Message {
}
};
class EventCategory_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/2> {
class EventCategory_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/2,
/*HAS_NONPACKED_REPEATED_FIELDS=*/false> {
public:
EventCategory_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -209,8 +205,9 @@ class EventCategory : public ::protozero::Message {
}
};
class TrackEvent_Decoder
: public ::protozero::TypedProtoDecoder</*MAX_FIELD_ID=*/48> {
class TrackEvent_Decoder : public ::protozero::TypedProtoDecoder<
/*MAX_FIELD_ID=*/48,
/*HAS_NONPACKED_REPEATED_FIELDS=*/true> {
public:
TrackEvent_Decoder(const uint8_t* data, size_t len)
: TypedProtoDecoder(data, len) {}
@@ -366,11 +363,11 @@ class TrackEvent : public ::protozero::Message {
9,
::protozero::proto_utils::RepetitionType::kNotRepeated,
::protozero::proto_utils::ProtoSchemaType::kEnum,
TrackEvent_Type,
::perfetto::protos::pbzero::TrackEvent_Type,
TrackEvent>;
static constexpr FieldMetadata_Type kType{};
void set_type(TrackEvent_Type value) {
void set_type(::perfetto::protos::pbzero::TrackEvent_Type value) {
static constexpr uint32_t field_id = FieldMetadata_Type::kFieldId;
// Call the appropriate protozero::Message::Append(field_id, ...)
// method based on the type of the field.