commit 3756a8350b9f22c78ab195681c262554a7f6e400
author Craig Donner <cdonner@google.com> Tue Jun 14 03:55:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 03:55:27 2016 +0000
tree 591ab3edd1f559289da355152e901a0cd1f99957
parent 41a67e15ddfe461c5ce16f5af32d46f270b65211
parent 7aa838826c48fe0ec3c4a75e709316c87ce9aea5

Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev-plus-aosp

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 0098b6c..9035707 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -636,7 +636,8 @@
     dump_files("UPTIME MMC PERF", mmcblk0, skip_not_stat, dump_stat_from_fd);
     dump_emmc_ecsd("/d/mmc0/mmc0:0001/ext_csd");
     dump_file("MEMORY INFO", "/proc/meminfo");
-    run_command("CPU INFO", 10, "top", "-n", "1", "-d", "1", "-m", "30", "-H", NULL);
+    run_command("CPU INFO", 10, "toybox", "top", "-b", "-n", "1", "-H", "-s", "6",
+                "-o", "pid,tid,user,pr,ni,%cpu,s,virt,res,pcy,cmd,name", NULL);
     run_command("PROCRANK", 20, SU_PATH, "root", "procrank", NULL);
     dump_file("VIRTUAL MEMORY STATS", "/proc/vmstat");
     dump_file("VMALLOC INFO", "/proc/vmallocinfo");