commit 83ef3ca923a374f71292ac7768a6e8ea8624efea
author Hector Dearman <hjd@google.com> Thu Nov 21 19:23:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 21 19:23:09 2019 +0000
tree f2cb19268793a5a7118520ee0af36111e1e426b2
parent b9eff0ee1c9ef9b2ca7ec45b987a59b89d470b19
parent a996ff56d5989a09bc6c69987a6e8fbc39dc37d9

Merge "traced_probes: Bump atrace timeout"

src/traced/probes/ftrace/atrace_wrapper.cc

diff --git a/src/traced/probes/ftrace/atrace_wrapper.cc b/src/traced/probes/ftrace/atrace_wrapper.cc
index 76e7b7a..2522e47 100644
--- a/src/traced/probes/ftrace/atrace_wrapper.cc
+++ b/src/traced/probes/ftrace/atrace_wrapper.cc
@@ -108,7 +108,7 @@
   fds[0].events = POLLIN;
 
   // Store the start time of atrace and setup the timeout.
-  constexpr auto timeout = base::TimeMillis(7500);
+  constexpr auto timeout = base::TimeMillis(20000);
   auto start = base::GetWallTimeMs();
   for (;;) {
     // Check if we are below the timeout and update the select timeout to