summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2015-10-09 21:25:32 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-09 21:25:32 +0000
commitca78bbfd85dcff3c635b813d1cbe882b576b433c (patch)
tree6bc72eef4f085c01049619aeacd37289fbad0bfa
parent313762d88e7820e689879e08f4a93eac3cf8af99 (diff)
parent52b2537550a6fc43587980887858c7e7150255b0 (diff)
am 52b25375: Merge "dumpstate: add -v printable to logcat"
* commit '52b2537550a6fc43587980887858c7e7150255b0': dumpstate: add -v printable to logcat
-rw-r--r--cmds/dumpstate/dumpstate.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index d22e492b70..7b122db4dc 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -337,17 +337,28 @@ static void dumpstate() {
if (timeout < 20000) {
timeout = 20000;
}
- run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime", "-d", "*:v", NULL);
+ run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime",
+ "-v", "printable",
+ "-d",
+ "*:v", NULL);
timeout = logcat_timeout("events");
if (timeout < 20000) {
timeout = 20000;
}
- 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",
+ "-v", "printable",
+ "-d",
+ "*:v", NULL);
timeout = logcat_timeout("radio");
if (timeout < 20000) {
timeout = 20000;
}
- 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",
+ "-v", "printable",
+ "-d",
+ "*:v", NULL);
run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);
@@ -420,8 +431,12 @@ static void dumpstate() {
}
/* kernels must set CONFIG_PSTORE_PMSG, slice up pstore with device tree */
- run_command("LAST LOGCAT", 10, "logcat", "-L", "-v", "threadtime",
- "-b", "all", "-d", "*:v", NULL);
+ run_command("LAST LOGCAT", 10, "logcat", "-L",
+ "-b", "all",
+ "-v", "threadtime",
+ "-v", "printable",
+ "-d",
+ "*:v", NULL);
/* The following have a tendency to get wedged when wifi drivers/fw goes belly-up. */