Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fac7e2b5 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Increase meminfo dumpsys timeout 

Increases the meminfo dumpsys timeout from 30s to 60s, since
30s is sometimes not enough.

Test: Check that longer timeout is used in writeDump call
Bug: 191615258
Change-Id: Ic270a81f3dde1329881023d533ffbff43a82127c
parent 2bfbdffc

cmds/dumpstate/dumpstate.cpp

+9 −2
Original line number Diff line number Diff line
@@ -1240,8 +1240,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;

            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);