From 74bdab0b14c592053ff71654ab51a0f116114a42 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 7 Mar 2016 11:59:01 -0800 Subject: [PATCH] Increase kDumpWaitTimeout 10x for target builds New timeout is 100s, the old one was occasionally hit by overloaded device. This caused a confusing crash in the barrier destructor since not all the threads had went through the barrier yet. Bug: 27334917 Change-Id: I5bcdaa39cfc104f3555f62b6117b417c8bf36e7a --- runtime/thread_list.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index cf515b60c..4c81d4f1e 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -171,9 +171,9 @@ void ThreadList::DumpUnattachedThreads(std::ostream& os) { closedir(d); } -// Dump checkpoint timeout in milliseconds. Larger amount on the host, as dumping will invoke -// addr2line when available. -static constexpr uint32_t kDumpWaitTimeout = kIsTargetBuild ? 10000 : 20000; +// Dump checkpoint timeout in milliseconds. Larger amount on the target, since the device could be +// overloaded with ANR dumps. +static constexpr uint32_t kDumpWaitTimeout = kIsTargetBuild ? 100000 : 20000; // A closure used by Thread::Dump. class DumpCheckpoint FINAL : public Closure { -- 2.11.0