commit f22f52ee0c8a5b42616b29f8d07db1b2684e1edd
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 29 21:37:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 29 21:37:39 2020 +0000
tree 9bc4c21a448af39371330bd3f58c2e801c7499e3
parent 17f1cedaee05a56596263fe27649ceb89cedec11
parent 767779f538ad64c3e5012c24e58e5e3e8e802b75

Merge "Optimise read time_in_state"

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}

include/perfetto/tracing/track.h

diff --git a/include/perfetto/tracing/track.h b/include/perfetto/tracing/track.h
index 8a4df74..f297b08 100644
--- a/include/perfetto/tracing/track.h
+++ b/include/perfetto/tracing/track.h
@@ -91,8 +91,11 @@
   static Track Global(uint64_t id) { return Track(id, Track()); }
 
  protected:
-  static Track MakeThreadTrack(base::PlatformThreadId tid_) {
-    return Track(static_cast<uint64_t>(tid_), MakeProcessTrack());
+  static Track MakeThreadTrack(base::PlatformThreadId tid) {
+    // If tid were 0 here (which is an invalid tid), we would create a thread
+    // track with a uuid that conflicts with the corresponding ProcessTrack.
+    PERFETTO_DCHECK(tid != 0);
+    return Track(static_cast<uint64_t>(tid), MakeProcessTrack());
   }
 
   static Track MakeProcessTrack() { return Track(process_uuid, Track()); }