InputTracer: Add timestamp to perfetto trace packets
Use the event processing time as the packet timestamp for input events,
and use the delivery time as the packet timestamp for dispatch events.
Bug: 332714237
Bug: 210460522
Test: atest inputflinger_tests
Test: manual with perfetto
Change-Id: I30f4c21dfee68603d0dad01d205f8a5581e6db31
diff --git a/services/inputflinger/dispatcher/trace/InputTracer.cpp b/services/inputflinger/dispatcher/trace/InputTracer.cpp
index a1a87af..5d2b854 100644
--- a/services/inputflinger/dispatcher/trace/InputTracer.cpp
+++ b/services/inputflinger/dispatcher/trace/InputTracer.cpp
@@ -145,7 +145,8 @@
eventState->metadata.isSecure |= targetInfo.isSecureWindow;
}
-void InputTracer::eventProcessingComplete(const EventTrackerInterface& cookie) {
+void InputTracer::eventProcessingComplete(const EventTrackerInterface& cookie,
+ nsecs_t processingTimestamp) {
if (isDerivedCookie(cookie)) {
LOG(FATAL) << "Event processing cannot be set from a derived cookie.";
}
@@ -154,7 +155,7 @@
LOG(FATAL) << "Traced event was already logged. "
"eventProcessingComplete() was likely called more than once.";
}
- eventState->onEventProcessingComplete();
+ eventState->onEventProcessingComplete(processingTimestamp);
}
std::unique_ptr<EventTrackerInterface> InputTracer::traceDerivedEvent(
@@ -242,7 +243,8 @@
// --- InputTracer::EventState ---
-void InputTracer::EventState::onEventProcessingComplete() {
+void InputTracer::EventState::onEventProcessingComplete(nsecs_t processingTimestamp) {
+ metadata.processingTimestamp = processingTimestamp;
metadata.isImeConnectionActive = tracer.mIsImeConnectionActive;
// Write all of the events known so far to the trace.
@@ -277,7 +279,7 @@
// We should never end up here in normal operation. However, in tests, it's possible that we
// stop and destroy InputDispatcher without waiting for it to finish processing events, at
// which point an event (and thus its EventState) may be destroyed before processing finishes.
- onEventProcessingComplete();
+ onEventProcessingComplete(systemTime(CLOCK_MONOTONIC));
}
} // namespace android::inputdispatcher::trace::impl