tp: move parsing of systeminfo from parse to tokenization
SystemInfo does not have a timestamp as it's synthesized by traced.
Instead, it should be treated as a packet which appears before all data
packets.
Treat the systeminfo like any other context packet and parse it during
tokenization time so that we have to context inside available when
parsing real trace packets.
Bug: 155308466
Change-Id: Iaf767a2d93819531cf51e83ab0ab4f72a2b3d85b
diff --git a/src/trace_processor/importers/proto/system_probes_module.cc b/src/trace_processor/importers/proto/system_probes_module.cc
index 1a9af08..fde63fc 100644
--- a/src/trace_processor/importers/proto/system_probes_module.cc
+++ b/src/trace_processor/importers/proto/system_probes_module.cc
@@ -35,6 +35,20 @@
RegisterForField(TracePacket::kCpuInfoFieldNumber, context);
}
+ModuleResult SystemProbesModule::TokenizePacket(
+ const protos::pbzero::TracePacket::Decoder& decoder,
+ TraceBlobView*,
+ int64_t,
+ PacketSequenceState*,
+ uint32_t field_id) {
+ switch (field_id) {
+ case TracePacket::kSystemInfoFieldNumber:
+ parser_.ParseSystemInfo(decoder.system_info());
+ return ModuleResult::Handled();
+ }
+ return ModuleResult::Ignored();
+}
+
void SystemProbesModule::ParsePacket(const TracePacket::Decoder& decoder,
const TimestampedTracePiece& ttp,
uint32_t field_id) {
@@ -48,9 +62,6 @@
case TracePacket::kSysStatsFieldNumber:
parser_.ParseSysStats(ttp.timestamp, decoder.sys_stats());
return;
- case TracePacket::kSystemInfoFieldNumber:
- parser_.ParseSystemInfo(decoder.system_info());
- return;
case TracePacket::kCpuInfoFieldNumber:
parser_.ParseCpuInfo(decoder.cpu_info());
return;
diff --git a/src/trace_processor/importers/proto/system_probes_module.h b/src/trace_processor/importers/proto/system_probes_module.h
index 438eabe..8fcd94b 100644
--- a/src/trace_processor/importers/proto/system_probes_module.h
+++ b/src/trace_processor/importers/proto/system_probes_module.h
@@ -30,6 +30,12 @@
public:
explicit SystemProbesModule(TraceProcessorContext* context);
+ ModuleResult TokenizePacket(const protos::pbzero::TracePacket::Decoder&,
+ TraceBlobView* packet,
+ int64_t packet_timestamp,
+ PacketSequenceState*,
+ uint32_t field_id) override;
+
void ParsePacket(const protos::pbzero::TracePacket::Decoder& decoder,
const TimestampedTracePiece& ttp,
uint32_t field_id) override;
