diff options
| author | Gavin Corkery <gavincorkery@google.com> | 2021-07-12 09:34:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-12 09:34:57 +0000 |
| commit | b058a604011ab7f98513345cbd4fb9573065c959 (patch) | |
| tree | bae95f642e10618f3f198519e4332595b97d502a | |
| parent | e565bb8181dab33bb50495d4f1d8e2bf72c27cac (diff) | |
| parent | 10aa1c00f0127552a1c1f3d8dd432915240130f3 (diff) | |
| download | native-b058a604011ab7f98513345cbd4fb9573065c959.tar.gz | |
Merge "Increase meminfo dumpsys timeout" into sc-dev
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 4eb601dd01..2d11b908c2 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -1241,8 +1241,15 @@ static Dumpstate::RunStatus RunDumpsysTextByPriority(const std::string& title, i if (status == OK) { dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority); std::chrono::duration<double> elapsed_seconds; - status = dumpsys.writeDump(STDOUT_FILENO, service, service_timeout, - /* as_proto = */ false, elapsed_seconds, bytes_written); + if (priority == IServiceManager::DUMP_FLAG_PRIORITY_HIGH && + service == String16("meminfo")) { + // Use a longer timeout for meminfo, since 30s is not always enough. + status = dumpsys.writeDump(STDOUT_FILENO, service, 60s, + /* as_proto = */ false, elapsed_seconds, bytes_written); + } else { + status = dumpsys.writeDump(STDOUT_FILENO, service, service_timeout, + /* as_proto = */ false, elapsed_seconds, bytes_written); + } dumpsys.writeDumpFooter(STDOUT_FILENO, service, elapsed_seconds); bool dump_complete = (status == OK); dumpsys.stopDumpThread(dump_complete); |