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

Commit a282cdaf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Increased some timeouts."

parents 259820ce 6188412d

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ int main(int argc, char *argv[]) { 


    // Invoking the following dumpsys calls before dump_traces() to try and

    // keep the system stats as close to its initial state as possible.

    run_command_as_shell("DUMPSYS MEMINFO", 30, "dumpsys", "-t", "30", "meminfo", "-a", NULL);

    run_command_as_shell("DUMPSYS MEMINFO", 90, "dumpsys", "-t", "90", "meminfo", "-a", NULL);

    run_command_as_shell("DUMPSYS CPUINFO", 10, "dumpsys", "-t", "10", "cpuinfo", "-a", NULL);



    /* collect stack traces from Dalvik and native processes (needs root) */

cmds/dumpstate/utils.cpp

+3 −1
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 


static const int64_t NANOS_PER_SEC = 1000000000;



static const int TRACE_DUMP_TIMEOUT_MS = 10000; // 10 seconds



/* list of native processes to include in the native dumps */

// This matches the /proc/pid/exe link instead of /proc/pid/cmdline.

static const char* native_processes_to_dump[] = {
@@ -1101,7 +1103,7 @@ const char *dump_traces() { 


            /* wait for the writable-close notification from inotify */

            struct pollfd pfd = { ifd, POLLIN, 0 };

            int ret = poll(&pfd, 1, 5000);  /* 5 sec timeout */

            int ret = poll(&pfd, 1, TRACE_DUMP_TIMEOUT_MS);

            if (ret < 0) {

                MYLOGE("poll: %s\n", strerror(errno));

            } else if (ret == 0) {