am 2abef0c3: am ca78bbfd: am 52b25375: Merge "dumpstate: add -v printable to logcat" (05eb0e57) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.c

+20 −5

Original line number	Diff line number	Diff line
		@@ -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. */