commit dc1ef3c356922a77e96873f94342966890038d3f
author Nathan Bullock <nathanbullock@google.com> Wed Sep 17 09:24:10 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Sep 19 03:00:11 2014 +0000
tree 8ad52f3a7e195014db519c38d5087a03dcc50370
parent 0be0f736d7d28b20e116422d563224a4f68d5fb5

metrics: read /sys/class/block/*/stat correctly

TEST=unit tests, manual tested on panther_embedded
BUG=chromium:415118

Change-Id: I849a9b7849a27d29d9d24bb1575f113e43716bd5
Reviewed-on: https://chromium-review.googlesource.com/218504
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Nathan Bullock <nathanbullock@google.com>
Tested-by: Nathan Bullock <nathanbullock@google.com>

metrics/metrics_daemon.cc

diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index b8d013d..5f9d851 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -495,7 +495,7 @@
     LOG_IF(WARNING, nchars == sizeof(line))
         << "line too long in " << diskstats_path_;
     line[nchars] = '\0';
-    nitems = sscanf(line, "%*d %*d %" PRIu64 "d %*d %*d %*d %" PRIu64 "d",
+    nitems = sscanf(line, "%*d %*d %" PRIu64 " %*d %*d %*d %" PRIu64,
                     read_sectors, write_sectors);
     if (nitems == 2) {
       success = true;

metrics/metrics_daemon_test.cc

diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 0116a19..9b60ca4 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -36,8 +36,8 @@
 
 static const char kFakeDiskStatsName[] = "fake-disk-stats";
 static const char kFakeDiskStatsFormat[] =
-    "    1793     1788    %" PRIu64 "d   105580    "
-    "    196      175     %" PRIu64 "d    30290    "
+    "    1793     1788    %" PRIu64 "   105580    "
+    "    196      175     %" PRIu64 "    30290    "
     "    0    44060   135850\n";
 static const uint64_t kFakeReadSectors[] = {80000, 100000};
 static const uint64_t kFakeWriteSectors[] = {3000, 4000};