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

Commit 5ec5888c authored by Felipe Leme's avatar Felipe Leme
Browse files

Increased minimum logcat timeout from 20s to 50s... 

...as 20s is often not enough when the device has larger logcat buffer sizes.

Test:  mmm -j32 frameworks/native/cmds/dumpstate/ && adb sync && \
      adb shell /data/nativetest/dumpstate_test/dumpstate_test && \
      adb shell /data/nativetest64/dumpstate_test/dumpstate_test && \
      printf "\n\n#### GOOD NEWS, EVERYONE: ALL TESTS PASSED! ####\n"

Fixes: 70597931

Change-Id: Ie302f46ed405d33bc7411dce28a93949183d4bac
parent da9904d6

cmds/dumpstate/dumpstate.cpp

+8 −6
Original line number Diff line number Diff line
@@ -831,28 +831,30 @@ static void DoKmsg() { 
    }

}



static const long MINIMUM_LOGCAT_TIMEOUT_MS = 50000;



static void DoLogcat() {

    unsigned long timeout_ms;

    // DumpFile("EVENT LOG TAGS", "/etc/event-log-tags");

    // calculate timeout

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

    if (timeout_ms < 20000) {

        timeout_ms = 20000;

    if (timeout_ms < MINIMUM_LOGCAT_TIMEOUT_MS) {

        timeout_ms = MINIMUM_LOGCAT_TIMEOUT_MS;

    }

    RunCommand("SYSTEM LOG",

               {"logcat", "-v", "threadtime", "-v", "printable", "-v", "uid", "-d", "*:v"},

               CommandOptions::WithTimeoutInMs(timeout_ms).Build());

    timeout_ms = logcat_timeout("events");

    if (timeout_ms < 20000) {

        timeout_ms = 20000;

    if (timeout_ms < MINIMUM_LOGCAT_TIMEOUT_MS) {

        timeout_ms = MINIMUM_LOGCAT_TIMEOUT_MS;

    }

    RunCommand("EVENT LOG",

               {"logcat", "-b", "events", "-v", "threadtime", "-v", "printable", "-v", "uid",

                        "-d", "*:v"},

               CommandOptions::WithTimeoutInMs(timeout_ms).Build());

    timeout_ms = logcat_timeout("radio");

    if (timeout_ms < 20000) {

        timeout_ms = 20000;

    if (timeout_ms < MINIMUM_LOGCAT_TIMEOUT_MS) {

        timeout_ms = MINIMUM_LOGCAT_TIMEOUT_MS;

    }

    RunCommand("RADIO LOG",

               {"logcat", "-b", "radio", "-v", "threadtime", "-v", "printable", "-v", "uid",