commit 8ab89c5bfe31fe3237b0307e50bb301688166f7e
author Steve Fung <stevefung@chromium.org> Mon Jan 05 13:48:30 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Jan 07 05:13:28 2015 +0000
tree d92e8000bdff376210b54339e78b13bf2b983eec
parent e86591e58533e750481ee3177bd168331b5dd016

metrics: Fix metrics_daemon Meminfo callback interval

With the switch from the glib run loop to base::MessageLoop, the
interval for scheduling Meminfo callbacks was incorrectly set to
milliseconds.  Fix it back to seconds.

BUG=chromium:445573
TEST=strace shows metrics_daemon sleep for 30 seconds between
     collecting statistics

Change-Id: I4b4b597273d3cf04b9972011dd0a7386ea14233d
Reviewed-on: https://chromium-review.googlesource.com/238466
Reviewed-by: Chih-Chung Chang <chihchung@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Steve Fung <stevefung@chromium.org>
Tested-by: Steve Fung <stevefung@chromium.org>

metrics/metrics_daemon.cc

diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index acd96c0..a746e06 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -776,7 +776,7 @@
   base::TimeDelta waitDelta = base::TimeDelta::FromSeconds(wait);
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&MetricsDaemon::MeminfoCallback, base::Unretained(this),
-                 base::TimeDelta::FromMilliseconds(kMetricMeminfoInterval)),
+                 waitDelta),
       waitDelta);
 }
 
@@ -795,7 +795,7 @@
   if (reschedule) {
     base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
         base::Bind(&MetricsDaemon::MeminfoCallback, base::Unretained(this),
-                   base::TimeDelta::FromMilliseconds(kMetricMeminfoInterval)),
+                   wait),
         wait);
   }
 }