commit a45964cb43c4f0cc580af333992c393c44f2b2fe
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 28 21:18:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 28 21:18:25 2017 +0000
tree 07c632a3707b71b1180bf2055097b6de668859d7
parent 2912033109630b0c1f2fb58e48dc5c507dec0841
parent cdab923e62a7c3f3edd48214f8ad24222cee8ead

Merge "storaged: fix task io stats parsing"

storaged/storaged_uid_monitor.cpp

diff --git a/storaged/storaged_uid_monitor.cpp b/storaged/storaged_uid_monitor.cpp
index 1c98477..a69bc33 100644
--- a/storaged/storaged_uid_monitor.cpp
+++ b/storaged/storaged_uid_monitor.cpp
@@ -73,7 +73,7 @@
         !ParseUint(fields[8],  &io[BACKGROUND].write_bytes) ||
         !ParseUint(fields[9],  &io[FOREGROUND].fsync) ||
         !ParseUint(fields[10], &io[BACKGROUND].fsync)) {
-        LOG_TO(SYSTEM, WARNING) << "Invalid I/O stats: \""
+        LOG_TO(SYSTEM, WARNING) << "Invalid uid I/O stats: \""
                                 << s << "\"";
         return false;
     }
@@ -84,23 +84,25 @@
 bool task_info::parse_task_io_stats(std::string&& s)
 {
     std::vector<std::string> fields = Split(s, ",");
-    if (fields.size() < 13 ||
-        !ParseInt(fields[2],  &pid) ||
-        !ParseUint(fields[3],  &io[FOREGROUND].rchar) ||
-        !ParseUint(fields[4],  &io[FOREGROUND].wchar) ||
-        !ParseUint(fields[5],  &io[FOREGROUND].read_bytes) ||
-        !ParseUint(fields[6],  &io[FOREGROUND].write_bytes) ||
-        !ParseUint(fields[7],  &io[BACKGROUND].rchar) ||
-        !ParseUint(fields[8],  &io[BACKGROUND].wchar) ||
-        !ParseUint(fields[9],  &io[BACKGROUND].read_bytes) ||
-        !ParseUint(fields[10], &io[BACKGROUND].write_bytes) ||
-        !ParseUint(fields[11], &io[FOREGROUND].fsync) ||
-        !ParseUint(fields[12], &io[BACKGROUND].fsync)) {
-        LOG_TO(SYSTEM, WARNING) << "Invalid I/O stats: \""
+    size_t size = fields.size();
+    if (size < 13 ||
+        !ParseInt(fields[size - 11],  &pid) ||
+        !ParseUint(fields[size - 10],  &io[FOREGROUND].rchar) ||
+        !ParseUint(fields[size - 9],  &io[FOREGROUND].wchar) ||
+        !ParseUint(fields[size - 8],  &io[FOREGROUND].read_bytes) ||
+        !ParseUint(fields[size - 7],  &io[FOREGROUND].write_bytes) ||
+        !ParseUint(fields[size - 6],  &io[BACKGROUND].rchar) ||
+        !ParseUint(fields[size - 5],  &io[BACKGROUND].wchar) ||
+        !ParseUint(fields[size - 4],  &io[BACKGROUND].read_bytes) ||
+        !ParseUint(fields[size - 3], &io[BACKGROUND].write_bytes) ||
+        !ParseUint(fields[size - 2], &io[FOREGROUND].fsync) ||
+        !ParseUint(fields[size - 1], &io[BACKGROUND].fsync)) {
+        LOG_TO(SYSTEM, WARNING) << "Invalid task I/O stats: \""
                                 << s << "\"";
         return false;
     }
-    comm = fields[1];
+    comm = Join(std::vector<std::string>(
+                fields.begin() + 1, fields.end() - 11), ',');
     return true;
 }