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

Commit 03d61d95 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) 

- temporary measure until root issues can be resolved.

Bug: 23685592
Change-Id: Ia33f4e3928a457c3dcd730ad2c2c57d13fbf133d
parent e50ab08f

cmds/dumpstate/dumpstate.c

+8 −6
Original line number Diff line number Diff line
@@ -262,6 +262,8 @@ static unsigned long logcat_timeout(char *name) { 


/* End copy from system/core/logd/LogBuffer.cpp */



static const unsigned long logcat_min_timeout = 40000; /* ms */



/* dumps the current system state to stdout */

static void dumpstate() {

    unsigned long timeout;
@@ -334,18 +336,18 @@ static void dumpstate() { 
    // dump_file("EVENT LOG TAGS", "/etc/event-log-tags");

    // calculate timeout

    timeout = logcat_timeout("main") + logcat_timeout("system") + logcat_timeout("crash");

    if (timeout < 20000) {

        timeout = 20000;

    if (timeout < logcat_min_timeout) {

        timeout = logcat_min_timeout;

    }

    run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime", "-d", "*:v", NULL);

    timeout = logcat_timeout("events");

    if (timeout < 20000) {

        timeout = 20000;

    if (timeout < logcat_min_timeout) {

        timeout = logcat_min_timeout;

    }

    run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL);

    timeout = logcat_timeout("radio");

    if (timeout < 20000) {

        timeout = 20000;

    if (timeout < logcat_min_timeout) {

        timeout = logcat_min_timeout;

    }

    run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);