commit 3cd671e868a3648a4ca00c3e0b063e983d34b702
author Jin Qian <jinqian@google.com> Wed Sep 27 18:50:04 2017 -0700
committer Jin Qian <jinqian@google.com> Thu Sep 28 10:32:40 2017 -0700
tree bc120defa1d68f03d658a6d67999996911eea47f
parent 5696e6353b4f349b316097fcb783b4cfcb5511ef

dumpstate: dump iotop to show io threads

Also fix title for storaged -u.

Test: adb bugreport
Bug: 63629306
Change-Id: I31a6225c19cd86bfe1c55d71c2ef3f02802c3b93

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index b3d628c..c41edf5 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1135,7 +1135,7 @@
     RunCommand("VOLD DUMP", {"vdc", "dump"});
     RunCommand("SECURE CONTAINERS", {"vdc", "asec", "list"});
 
-    RunCommand("STORAGED TASKIOINFO", {"storaged", "-u"}, CommandOptions::WithTimeout(10).Build());
+    RunCommand("STORAGED UID IO INFO", {"storaged", "-u"});
 
     RunCommand("FILESYSTEMS & FREE SPACE", {"df"});
 
@@ -1850,6 +1850,9 @@
         RunCommand("DETAILED SOCKET STATE", {"ss", "-eionptu"},
                    CommandOptions::WithTimeout(10).Build());
 
+        // Run iotop as root to show top 100 IO threads
+        RunCommand("IOTOP", {"iotop", "-n", "1", "-m", "100"});
+
         if (!DropRootUser()) {
             return -1;
         }