commit ad1d18f9b3713767d734df0fd0c602b674c1d01b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 28 23:05:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 28 23:05:35 2017 +0000
tree 30df13ab15aa5d768649dad9109028930b03ab7f
parent 234250b8ad9e0f125a866ae31b0f65ef823605a1
parent 3cd671e868a3648a4ca00c3e0b063e983d34b702

Merge "dumpstate: dump iotop to show io threads"

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;
         }