Add a new TrustedPacket for received triggers.
We create a packet with a timestamp matching the time a trigger was received.
In addition we include enough data to determine which trigger and who called
it. This allows us to emit whatever triggers we've received into the trace
and the UI will be able to annotate the trace based on these packets.
Bug: 128966650
Change-Id: Ib751f4f2547cc2c8f68161af7437de29395d342b
diff --git a/src/tracing/core/tracing_service_impl.h b/src/tracing/core/tracing_service_impl.h
index db174ce..bda8c29 100644
--- a/src/tracing/core/tracing_service_impl.h
+++ b/src/tracing/core/tracing_service_impl.h
@@ -398,8 +398,13 @@
// were received at. This is used to insert 'fake' packets back to the
// consumer so they can tell when some event happened. The order matches the
// order they were received.
- std::vector<std::pair<uint64_t, TraceConfig::TriggerConfig::Trigger>>
- received_triggers;
+ struct TriggerInfo {
+ uint64_t boot_time_ns;
+ std::string trigger_name;
+ std::string producer_name;
+ uid_t producer_uid;
+ };
+ std::vector<TriggerInfo> received_triggers;
// The trace config provided by the Consumer when calling
// EnableTracing(), plus any updates performed by ChangeTraceConfig.
@@ -432,6 +437,9 @@
// Whether we put the system info into the trace output yet.
bool did_emit_system_info = false;
+ // The number of received triggers we've emitted into the trace output.
+ size_t num_triggers_emitted_into_trace = 0;
+
State state = DISABLED;
// If the consumer detached the session, this variable defines the key used
@@ -480,6 +488,7 @@
TraceStats GetTraceStats(TracingSession* tracing_session);
void MaybeEmitTraceConfig(TracingSession*, std::vector<TracePacket>*);
void MaybeEmitSystemInfo(TracingSession*, std::vector<TracePacket>*);
+ void MaybeEmitReceivedTriggers(TracingSession*, std::vector<TracePacket>*);
void OnFlushTimeout(TracingSessionID, FlushRequestID);
void OnDisableTracingTimeout(TracingSessionID);
void DisableTracingNotifyConsumerAndFlushFile(TracingSession*);