ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
- temporary measure until root issues can be resolved.

Bug: 23685592
Change-Id: Ia33f4e3928a457c3dcd730ad2c2c57d13fbf133d
This commit is contained in:
Mark Salyzyn 2015-12-18 10:14:46 -08:00
parent e50ab08fd6
commit 03d61d95fa
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/dumpstate/dumpstate.c
View File

@ -262,6 +262,8 @@ static unsigned long logcat_timeout(char *name) {
/* End copy from system/core/logd/LogBuffer.cpp */ /* End copy from system/core/logd/LogBuffer.cpp */
static const unsigned long logcat_min_timeout = 40000; /* ms */
/* dumps the current system state to stdout */ /* dumps the current system state to stdout */
static void dumpstate() { static void dumpstate() {
unsigned long timeout; unsigned long timeout;
@ -334,18 +336,18 @@ static void dumpstate() {
// dump_file("EVENT LOG TAGS", "/etc/event-log-tags"); // dump_file("EVENT LOG TAGS", "/etc/event-log-tags");
// calculate timeout // calculate timeout
timeout = logcat_timeout("main") + logcat_timeout("system") + logcat_timeout("crash"); timeout = logcat_timeout("main") + logcat_timeout("system") + logcat_timeout("crash");
if (timeout < 20000) { if (timeout < logcat_min_timeout) {
timeout = 20000; timeout = logcat_min_timeout;
} }
run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime", "-d", "*:v", NULL); run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime", "-d", "*:v", NULL);
timeout = logcat_timeout("events"); timeout = logcat_timeout("events");
if (timeout < 20000) { if (timeout < logcat_min_timeout) {
timeout = 20000; timeout = logcat_min_timeout;
} }
run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL); run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL);
timeout = logcat_timeout("radio"); timeout = logcat_timeout("radio");
if (timeout < 20000) { if (timeout < logcat_min_timeout) {
timeout = 20000; timeout = logcat_min_timeout;
} }
run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL); run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);