commit 5f2a170a577258a2792bd768a8a776a562f4e6c2
author Yabin Cui <yabinc@google.com> Fri Jul 24 11:00:44 2015 -0700
committer Yabin Cui <yabinc@google.com> Fri Jul 24 11:00:44 2015 -0700
tree 199b41577f6718fd3d9fd828262b806378ded386
parent 5c9978ceeaeac2442c0ca4722111551ecbe6d144

Simpleperf: work around unexpected (pid, tid) pair.

Bug: 22185053
Change-Id: Ibd224ce9918eac9fa5a71ec00835b3af2b03e578

simpleperf/thread_tree.cpp

diff --git a/simpleperf/thread_tree.cpp b/simpleperf/thread_tree.cpp
index a442686..937dfcf 100644
--- a/simpleperf/thread_tree.cpp
+++ b/simpleperf/thread_tree.cpp
@@ -63,7 +63,11 @@
     AddThread(pid, tid, "unknown");
     it = thread_tree_.find(tid);
   } else {
-    CHECK_EQ(pid, it->second.get()->pid) << "tid = " << tid;
+    if (pid != it->second.get()->pid) {
+      // TODO: b/22185053.
+      LOG(DEBUG) << "unexpected (pid, tid) pair: expected (" << it->second.get()->pid << ", " << tid
+                 << "), actual (" << pid << ", " << tid << ")";
+    }
   }
   return it->second.get();
 }