Add iid field to UnsymbolizedSourceLocation
The iid field must be present, and must be the first one (see
PacketSequenceStateGeneration::InternMessage for more details).
Otherwise, interning doesn't work in Trace Processor.
Generally speaking, this is an unsafe proto change. But I think it is OK in this specific situation because this message is not used anywhere yet.
Bug: b/220179588
Change-Id: Id3f6f80adf016e6cd3128dd70fa64b0cd4208b3e
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 6369739..622c929 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -7368,19 +7368,20 @@
// Begin of protos/perfetto/trace/track_event/source_location.proto
+// --------------------
+// Interned data types:
+// --------------------
+
// A source location, represented as a native symbol.
// This is similar to `message Frame` from
// protos/perfetto/trace/profiling/profile_common.proto, but for abitrary
// source code locations (for example in track event args), not stack frames.
message UnsymbolizedSourceLocation {
- optional uint64 mapping_id = 1;
- optional uint64 rel_pc = 2;
+ optional uint64 iid = 1;
+ optional uint64 mapping_id = 2;
+ optional uint64 rel_pc = 3;
}
-// --------------------
-// Interned data types:
-// --------------------
-
message SourceLocation {
optional uint64 iid = 1;
optional string file_name = 2;
diff --git a/protos/perfetto/trace/track_event/source_location.proto b/protos/perfetto/trace/track_event/source_location.proto
index 62e2033..2a6a6e8 100644
--- a/protos/perfetto/trace/track_event/source_location.proto
+++ b/protos/perfetto/trace/track_event/source_location.proto
@@ -18,19 +18,20 @@
package perfetto.protos;
+// --------------------
+// Interned data types:
+// --------------------
+
// A source location, represented as a native symbol.
// This is similar to `message Frame` from
// protos/perfetto/trace/profiling/profile_common.proto, but for abitrary
// source code locations (for example in track event args), not stack frames.
message UnsymbolizedSourceLocation {
- optional uint64 mapping_id = 1;
- optional uint64 rel_pc = 2;
+ optional uint64 iid = 1;
+ optional uint64 mapping_id = 2;
+ optional uint64 rel_pc = 3;
}
-// --------------------
-// Interned data types:
-// --------------------
-
message SourceLocation {
optional uint64 iid = 1;
optional string file_name = 2;
