diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/thread_list.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index 364b7c2..0f64883 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -152,8 +152,7 @@ void ThreadList::DumpUnattachedThreads(std::ostream& os) { // Dump checkpoint timeout in milliseconds. Larger amount on the host, as dumping will invoke // addr2line when available. -static constexpr uint32_t kDumpWaitTimeoutTarget = 10000; -static constexpr uint32_t kDumpWaitTimeoutHost = 20000; +static constexpr uint32_t kDumpWaitTimeout = kIsTargetBuild ? 10000 : 20000; // A closure used by Thread::Dump. class DumpCheckpoint FINAL : public Closure { @@ -181,8 +180,7 @@ class DumpCheckpoint FINAL : public Closure { void WaitForThreadsToRunThroughCheckpoint(size_t threads_running_checkpoint) { Thread* self = Thread::Current(); ScopedThreadStateChange tsc(self, kWaitingForCheckPointsToRun); - bool timed_out = barrier_.Increment(self, threads_running_checkpoint, - kIsTargetBuild ? kDumpWaitTimeoutTarget : kDumpWaitTimeoutHost); + bool timed_out = barrier_.Increment(self, threads_running_checkpoint, kDumpWaitTimeout); if (timed_out) { // Avoid a recursive abort. LOG((kIsDebugBuild && (gAborting == 0)) ? FATAL : ERROR) |