commit 7bdd2994e300bd787688f2f7b1d66277835d859a
author Bartłomiej Grzesik <bag@semihalf.com> Wed Oct 05 07:57:21 2022 +0000
committer Bartłomiej Grzesik <bag@semihalf.com> Wed Oct 05 07:57:21 2022 +0000
tree 6111817898a5785ebd2fd5236c37e9ef77c83233
parent 1bdc9fb7eb060b9581d3b7b3f207e44d51c13d1f

Fix flags checks in V4L2Tracker

This CL fixes the flags checks in V4L2Tracker that always were
unreachable.

Bug: 217825939
Bug: 217827216
Bug: 232531771
Test: recorded a perfetto trace
Change-Id: I71647a767cf9d2f903d617ae2c42aeb1230bc86b

src/trace_processor/importers/ftrace/v4l2_tracker.cc

diff --git a/src/trace_processor/importers/ftrace/v4l2_tracker.cc b/src/trace_processor/importers/ftrace/v4l2_tracker.cc
index 56a2017..ed3a586 100644
--- a/src/trace_processor/importers/ftrace/v4l2_tracker.cc
+++ b/src/trace_processor/importers/ftrace/v4l2_tracker.cc
@@ -510,7 +510,7 @@
     present_flags.push_back("NO_CACHE_CLEAN");
   if (flags & 0x0000e000)
     present_flags.push_back("TIMESTAMP_MASK");
-  if (flags & 0x00000000)
+  if (flags == 0x00000000)
     present_flags.push_back("TIMESTAMP_UNKNOWN");
   if (flags & 0x00002000)
     present_flags.push_back("TIMESTAMP_MONOTONIC");
@@ -518,7 +518,7 @@
     present_flags.push_back("TIMESTAMP_COPY");
   if (flags & 0x00070000)
     present_flags.push_back("TSTAMP_SRC_MASK");
-  if (flags & 0x00000000)
+  if (flags == 0x00000000)
     present_flags.push_back("TSTAMP_SRC_EOF");
   if (flags & 0x00010000)
     present_flags.push_back("TSTAMP_SRC_SOE");
@@ -535,7 +535,7 @@
   std::vector<std::string> present_flags;
 
   if (flags == 0x0000)
-    return kNullStringId;
+    present_flags.push_back("USERBITS_USERDEFINED");
   if (flags & 0x0001)
     present_flags.push_back("FLAG_DROPFRAME");
   if (flags & 0x0002)
@@ -546,8 +546,6 @@
     present_flags.push_back("USERBITS_field(10)");
   if ((flags & 0x000C) == 0x000C)
     present_flags.push_back("USERBITS_field(11)");
-  if (flags == 0x0000)
-    present_flags.push_back("USERBITS_USERDEFINED");
   if (flags & 0x0008)
     present_flags.push_back("USERBITS_8BITCHARS");