commit 44ba8e1708abec70b1c85015aae59026fb214c83
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 12 21:07:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 21:07:37 2021 +0000
tree e8d3696a970022da2a6243d8fdae2757bc01f9b1
parent 2881d6b22d1eba089a772a15733151b67685cdaf
parent 9a570617ae1663b5a4aa9371cf7c44c092f42708

Merge "tp: don't log updated clocksnapshot if the clock is not changing"

src/trace_processor/importers/common/clock_tracker.h

diff --git a/src/trace_processor/importers/common/clock_tracker.h b/src/trace_processor/importers/common/clock_tracker.h
index 469aca7..80b2a4e 100644
--- a/src/trace_processor/importers/common/clock_tracker.h
+++ b/src/trace_processor/importers/common/clock_tracker.h
@@ -187,7 +187,8 @@
 
   void SetTraceTimeClock(ClockId clock_id) {
     PERFETTO_DCHECK(!IsReservedSeqScopedClockId(clock_id));
-    if (trace_time_clock_id_used_for_conversion_) {
+    if (trace_time_clock_id_used_for_conversion_ &&
+        trace_time_clock_id_ != clock_id) {
       PERFETTO_ELOG("Not updating trace time clock from %" PRIu64 " to %" PRIu64
                     " because the old clock was already used for timestamp "
                     "conversion - ClockSnapshot too late in trace?",