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

Commit 7cff4622 authored by Felipe Leme's avatar Felipe Leme
Browse files

Explicitly sets dumpsys timeout. 

The run_command() function takes a timeout as argument, and dumpsys can
also optionally takes a timeout with the -t argument, hence it makes
sense to pass the same value for both (otherwise dumpsys will timeout in
10s).

BUG: 29042642
Change-Id: Ib6e987d94e966686bab71223d7f910af9e549814
parent 0950fb3d

cmds/dumpstate/dumpstate.cpp

+11 −11
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 
#endif

    dump_file("INTERRUPTS (1)", "/proc/interrupts");



    run_command("NETWORK DIAGNOSTICS", 10, "dumpsys", "connectivity", "--diag", NULL);

    run_command("NETWORK DIAGNOSTICS", 10, "dumpsys", "-t", "10", "connectivity", "--diag", NULL);



#ifdef FWDUMP_bcmdhd

    run_command("DUMP WIFI STATUS", 20,
@@ -900,30 +900,30 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 
    printf("== Checkins\n");

    printf("========================================================\n");



    run_command("CHECKIN BATTERYSTATS", 30, "dumpsys", "batterystats", "-c", NULL);

    run_command("CHECKIN MEMINFO", 30, "dumpsys", "meminfo", "--checkin", NULL);

    run_command("CHECKIN NETSTATS", 30, "dumpsys", "netstats", "--checkin", NULL);

    run_command("CHECKIN PROCSTATS", 30, "dumpsys", "procstats", "-c", NULL);

    run_command("CHECKIN USAGESTATS", 30, "dumpsys", "usagestats", "-c", NULL);

    run_command("CHECKIN PACKAGE", 30, "dumpsys", "package", "--checkin", NULL);

    run_command("CHECKIN BATTERYSTATS", 30, "dumpsys", "-t", "30", "batterystats", "-c", NULL);

    run_command("CHECKIN MEMINFO", 30, "dumpsys", "-t", "30", "meminfo", "--checkin", NULL);

    run_command("CHECKIN NETSTATS", 30, "dumpsys", "-t", "30", "netstats", "--checkin", NULL);

    run_command("CHECKIN PROCSTATS", 30, "dumpsys", "-t", "30", "procstats", "-c", NULL);

    run_command("CHECKIN USAGESTATS", 30, "dumpsys", "-t", "30", "usagestats", "-c", NULL);

    run_command("CHECKIN PACKAGE", 30, "dumpsys", "-t", "30", "package", "--checkin", NULL);



    printf("========================================================\n");

    printf("== Running Application Activities\n");

    printf("========================================================\n");



    run_command("APP ACTIVITIES", 30, "dumpsys", "activity", "all", NULL);

    run_command("APP ACTIVITIES", 30, "-t", "30", "dumpsys", "activity", "all", NULL);



    printf("========================================================\n");

    printf("== Running Application Services\n");

    printf("========================================================\n");



    run_command("APP SERVICES", 30, "dumpsys", "activity", "service", "all", NULL);

    run_command("APP SERVICES", 30, "-t", "30", "dumpsys", "activity", "service", "all", NULL);



    printf("========================================================\n");

    printf("== Running Application Providers\n");

    printf("========================================================\n");



    run_command("APP SERVICES", 30, "dumpsys", "activity", "provider", "all", NULL);

    run_command("APP SERVICES", 30, "-t", "30", "dumpsys", "activity", "provider", "all", NULL);





    printf("========================================================\n");
@@ -1278,7 +1278,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 CPUINFO", 10, "dumpsys", "cpuinfo", "-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) */

    dump_traces_path = dump_traces();