Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac74e12 authored by Bertrand SIMONNET's avatar Bertrand SIMONNET Committed by chrome-internal-fetch
Browse files

metrics: use TimeDelta for upload_interval 

Use TimeDelta instead of int interpreted as seconds.

BUG=None
TEST=Unittests.

Change-Id: I18db8d558303291ab86b26c68c89203e0364b623
Reviewed-on: https://chromium-review.googlesource.com/222611


Reviewed-by: default avatarBertrand Simonnet <bsimonnet@chromium.org>
Tested-by: default avatarBertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
parent 71a62efc

metrics/metrics_daemon.cc

+4 −4
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void MetricsDaemon::RunUploaderTest() { 
  upload_service_.reset(new UploadService(new SystemProfileCache(true,

                                                                 config_root_),

                                          server_));

  upload_service_->Init(upload_interval_secs_, metrics_file_);

  upload_service_->Init(upload_interval_, metrics_file_);

  upload_service_->UploadEvent();

}
@@ -218,7 +218,7 @@ void MetricsDaemon::Init(bool testing, 
                         const string& vmstats_path,

                         const string& scaling_max_freq_path,

                         const string& cpuinfo_max_freq_path,

                         int upload_interval_secs,

                         const base::TimeDelta& upload_interval,

                         const string& server,

                         const string& metrics_file,

                         const string& config_root) {
@@ -227,7 +227,7 @@ void MetricsDaemon::Init(bool testing, 
  DCHECK(metrics_lib != nullptr);

  metrics_lib_ = metrics_lib;



  upload_interval_secs_ = upload_interval_secs;

  upload_interval_ = upload_interval;

  server_ = server;

  metrics_file_ = metrics_file;
@@ -326,7 +326,7 @@ void MetricsDaemon::Init(bool testing, 
  if (uploader_active) {

    LOG(INFO) << "uploader enabled";

    upload_service_.reset(new UploadService(new SystemProfileCache(), server_));

    upload_service_->Init(upload_interval_secs_, metrics_file_);

    upload_service_->Init(upload_interval_, metrics_file_);

  }

}

metrics/metrics_daemon.h

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class MetricsDaemon { 
            const std::string& vmstats_path,

            const std::string& cpuinfo_max_freq_path,

            const std::string& scaling_max_freq_path,

            int upload_interval_secs,

            const base::TimeDelta& upload_interval,

            const std::string& server,

            const std::string& metrics_file,

            const std::string& config_root);
@@ -379,7 +379,7 @@ class MetricsDaemon { 
  std::string scaling_max_freq_path_;

  std::string cpuinfo_max_freq_path_;



  int upload_interval_secs_;

  base::TimeDelta upload_interval_;

  std::string server_;

  std::string metrics_file_;

metrics/metrics_daemon_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int main(int argc, char** argv) { 
              "/proc/vmstat",

              kScalingMaxFreqPath,

              kCpuinfoMaxFreqPath,

              FLAGS_upload_interval_secs,

              base::TimeDelta::FromSeconds(FLAGS_upload_interval_secs),

              FLAGS_server,

              FLAGS_metrics_file,

              FLAGS_config_root);

metrics/metrics_daemon_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class MetricsDaemonTest : public testing::Test { 
                 kFakeVmStatsName,

                 kFakeScalingMaxFreqPath,

                 kFakeCpuinfoMaxFreqPath,

                 1800,

                 base::TimeDelta::FromMinutes(30),

                 kMetricsServer,

                 kMetricsFilePath,

                 "/");

metrics/uploader/upload_service.cc

+2 −2
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ UploadService::UploadService(SystemProfileSetter* setter, 
      sender_(new HttpSender(server)) {

}



void UploadService::Init(int upload_interval_secs,

void UploadService::Init(const base::TimeDelta& upload_interval,

                         const std::string& metrics_file) {

  base::StatisticsRecorder::Initialize();

  metrics_file_ = metrics_file;

  g_timeout_add_seconds(upload_interval_secs, &UploadEventStatic, this);

  g_timeout_add_seconds(upload_interval.InSeconds(), &UploadEventStatic, this);

}



void UploadService::StartNewLog() {