commit ce1ba111bfa122247ac186e7d2c6cf5943ba28cd
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 20 22:08:47 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 20 22:08:47 2016 +0000
tree a9f58b5d2034f3fef0a714460d48f7a338be1d2c
parent 8a759904d4a3cb5c03b167cf2a60827c7fcd58bb
parent a344f6a153d84d9adc4f4d3c608538d7741168a9

Merge "Make stream tracing have a higher thread count on host"

runtime/trace.cc

diff --git a/runtime/trace.cc b/runtime/trace.cc
index 0acc54d..e77a11e 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -869,7 +869,7 @@
 bool Trace::RegisterThread(Thread* thread) {
   pid_t tid = thread->GetTid();
   CHECK_LT(0U, static_cast<uint32_t>(tid));
-  CHECK_LT(static_cast<uint32_t>(tid), 65536U);
+  CHECK_LT(static_cast<uint32_t>(tid), kMaxThreadIdNumber);
 
   if (!(*seen_threads_)[tid]) {
     seen_threads_->set(tid);

runtime/trace.h

diff --git a/runtime/trace.h b/runtime/trace.h
index 80f1a4c..9b29fb9 100644
--- a/runtime/trace.h
+++ b/runtime/trace.h
@@ -41,7 +41,9 @@
 class Thread;
 
 using DexIndexBitSet = std::bitset<65536>;
-using ThreadIDBitSet = std::bitset<65536>;
+
+constexpr size_t kMaxThreadIdNumber = kIsTargetBuild ? 65536U : 1048576U;
+using ThreadIDBitSet = std::bitset<kMaxThreadIdNumber>;
 
 enum TracingMode {
   kTracingInactive,