From 6c9fbb9a3aaee50302d54de8f27fc712c836b9ea Mon Sep 17 00:00:00 2001 From: Bertrand SIMONNET Date: Mon, 21 Dec 2015 14:56:40 -0800 Subject: [PATCH] metricsd: Replace scoped_ptr with unique_ptr. scoped_ptr are a chromism. We should use unique_ptr instead. Bug: 25958769 Test: unit tests. Change-Id: Ie23ae2ef42f66dcc76f45a9dafa66c8ceb0a2d90 --- .../averaged_statistics_collector_test.cc | 5 +- metricsd/include/metrics/timer.h | 4 +- metricsd/metrics_collector.cc | 8 +-- metricsd/metrics_collector.h | 52 +++++++++---------- metricsd/persistent_integer_test.cc | 5 +- metricsd/timer.cc | 2 - metricsd/timer_test.cc | 6 +-- metricsd/uploader/system_profile_cache.h | 4 +- metricsd/uploader/upload_service.cc | 3 +- metricsd/uploader/upload_service.h | 7 +-- metricsd/uploader/upload_service_test.cc | 9 ++-- 11 files changed, 55 insertions(+), 50 deletions(-) diff --git a/metricsd/collectors/averaged_statistics_collector_test.cc b/metricsd/collectors/averaged_statistics_collector_test.cc index 9c97f0011..68f9f2f6c 100644 --- a/metricsd/collectors/averaged_statistics_collector_test.cc +++ b/metricsd/collectors/averaged_statistics_collector_test.cc @@ -16,11 +16,12 @@ #include "averaged_statistics_collector.h" +#include + #include #include #include -#include #include #include @@ -62,7 +63,7 @@ class AveragedStatisticsTest : public testing::Test { } // Collector used for tests. - scoped_ptr collector_; + std::unique_ptr collector_; // Temporary directory used for tests. base::ScopedTempDir temp_dir_; diff --git a/metricsd/include/metrics/timer.h b/metricsd/include/metrics/timer.h index b36ffffc1..c1b8edec6 100644 --- a/metricsd/include/metrics/timer.h +++ b/metricsd/include/metrics/timer.h @@ -19,10 +19,10 @@ #ifndef METRICS_TIMER_H_ #define METRICS_TIMER_H_ +#include #include #include -#include #include #include // for FRIEND_TEST @@ -121,7 +121,7 @@ class Timer : public TimerInterface { TimerState timer_state_; // Wrapper for the calls to the system clock. - scoped_ptr clock_wrapper_; + std::unique_ptr clock_wrapper_; DISALLOW_COPY_AND_ASSIGN(Timer); }; diff --git a/metricsd/metrics_collector.cc b/metricsd/metrics_collector.cc index e9edf2ed3..a5daab5a2 100644 --- a/metricsd/metrics_collector.cc +++ b/metricsd/metrics_collector.cc @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include @@ -665,7 +667,7 @@ void MetricsCollector::SendKernelCrashesCumulativeCountStats() { } void MetricsCollector::SendAndResetDailyUseSample( - const scoped_ptr& use) { + const unique_ptr& use) { SendSample(use->Name(), use->GetAndClear(), 1, // value of first bucket @@ -674,7 +676,7 @@ void MetricsCollector::SendAndResetDailyUseSample( } void MetricsCollector::SendAndResetCrashIntervalSample( - const scoped_ptr& interval) { + const unique_ptr& interval) { SendSample(interval->Name(), interval->GetAndClear(), 1, // value of first bucket @@ -683,7 +685,7 @@ void MetricsCollector::SendAndResetCrashIntervalSample( } void MetricsCollector::SendAndResetCrashFrequencySample( - const scoped_ptr& frequency) { + const unique_ptr& frequency) { SendSample(frequency->Name(), frequency->GetAndClear(), 1, // value of first bucket diff --git a/metricsd/metrics_collector.h b/metricsd/metrics_collector.h index 422ed7c39..45ef63d26 100644 --- a/metricsd/metrics_collector.h +++ b/metricsd/metrics_collector.h @@ -20,11 +20,11 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -38,6 +38,7 @@ #include "persistent_integer.h" using chromeos_metrics::PersistentInteger; +using std::unique_ptr; class MetricsCollector : public brillo::DBusDaemon { public: @@ -151,18 +152,17 @@ class MetricsCollector : public brillo::DBusDaemon { // Sends a sample representing the number of seconds of active use // for a 24-hour period and reset |use|. - void SendAndResetDailyUseSample( - const scoped_ptr& use); + void SendAndResetDailyUseSample(const unique_ptr& use); // Sends a sample representing a time interval between two crashes of the // same type and reset |interval|. void SendAndResetCrashIntervalSample( - const scoped_ptr& interval); + const unique_ptr& interval); // Sends a sample representing a frequency of crashes of some type and reset // |frequency|. void SendAndResetCrashFrequencySample( - const scoped_ptr& frequency); + const unique_ptr& frequency); // Initializes vm and disk stats reporting. void StatsReporterInit(); @@ -241,36 +241,36 @@ class MetricsCollector : public brillo::DBusDaemon { base::TimeDelta latest_cpu_use_microseconds_; // Persistent values and accumulators for crash statistics. - scoped_ptr daily_cycle_; - scoped_ptr weekly_cycle_; - scoped_ptr version_cycle_; + unique_ptr daily_cycle_; + unique_ptr weekly_cycle_; + unique_ptr version_cycle_; // Active use accumulated in a day. - scoped_ptr daily_active_use_; + unique_ptr daily_active_use_; // Active use accumulated since the latest version update. - scoped_ptr version_cumulative_active_use_; + unique_ptr version_cumulative_active_use_; // The CPU time accumulator. This contains the CPU time, in milliseconds, // used by the system since the most recent OS version update. - scoped_ptr version_cumulative_cpu_use_; + unique_ptr version_cumulative_cpu_use_; - scoped_ptr user_crash_interval_; - scoped_ptr kernel_crash_interval_; - scoped_ptr unclean_shutdown_interval_; + unique_ptr user_crash_interval_; + unique_ptr kernel_crash_interval_; + unique_ptr unclean_shutdown_interval_; - scoped_ptr any_crashes_daily_count_; - scoped_ptr any_crashes_weekly_count_; - scoped_ptr user_crashes_daily_count_; - scoped_ptr user_crashes_weekly_count_; - scoped_ptr kernel_crashes_daily_count_; - scoped_ptr kernel_crashes_weekly_count_; - scoped_ptr kernel_crashes_version_count_; - scoped_ptr unclean_shutdowns_daily_count_; - scoped_ptr unclean_shutdowns_weekly_count_; + unique_ptr any_crashes_daily_count_; + unique_ptr any_crashes_weekly_count_; + unique_ptr user_crashes_daily_count_; + unique_ptr user_crashes_weekly_count_; + unique_ptr kernel_crashes_daily_count_; + unique_ptr kernel_crashes_weekly_count_; + unique_ptr kernel_crashes_version_count_; + unique_ptr unclean_shutdowns_daily_count_; + unique_ptr unclean_shutdowns_weekly_count_; - scoped_ptr cpu_usage_collector_; - scoped_ptr disk_usage_collector_; - scoped_ptr averaged_stats_collector_; + unique_ptr cpu_usage_collector_; + unique_ptr disk_usage_collector_; + unique_ptr averaged_stats_collector_; std::unique_ptr device_; }; diff --git a/metricsd/persistent_integer_test.cc b/metricsd/persistent_integer_test.cc index 55d6cbc24..bf76261a4 100644 --- a/metricsd/persistent_integer_test.cc +++ b/metricsd/persistent_integer_test.cc @@ -14,12 +14,13 @@ * limitations under the License. */ -#include +#include #include #include #include #include +#include #include "persistent_integer.h" @@ -38,7 +39,7 @@ class PersistentIntegerTest : public testing::Test { }; TEST_F(PersistentIntegerTest, BasicChecks) { - scoped_ptr pi( + std::unique_ptr pi( new PersistentInteger(kBackingFileName, temp_dir_.path())); // Test initialization. diff --git a/metricsd/timer.cc b/metricsd/timer.cc index 0c2c119bf..06fc33626 100644 --- a/metricsd/timer.cc +++ b/metricsd/timer.cc @@ -18,8 +18,6 @@ #include -#include - #include "metrics/metrics_library.h" namespace chromeos_metrics { diff --git a/metricsd/timer_test.cc b/metricsd/timer_test.cc index bc7a2a12a..7a67e11f4 100644 --- a/metricsd/timer_test.cc +++ b/metricsd/timer_test.cc @@ -16,9 +16,9 @@ #include -#include #include #include +#include #include "metrics/metrics_library_mock.h" #include "metrics/timer.h" @@ -61,7 +61,7 @@ class TimerTest : public testing::Test { virtual void TearDown() {} Timer timer_; - scoped_ptr clock_wrapper_mock_; + std::unique_ptr clock_wrapper_mock_; base::TimeTicks stime, etime, stime2, etime2, stime3, etime3; }; @@ -436,7 +436,7 @@ class TimerReporterTest : public testing::Test { TimerReporter timer_reporter_; MetricsLibraryMock lib_; - scoped_ptr clock_wrapper_mock_; + std::unique_ptr clock_wrapper_mock_; base::TimeTicks stime, etime; }; diff --git a/metricsd/uploader/system_profile_cache.h b/metricsd/uploader/system_profile_cache.h index 0a21ad4f4..f9c484cd7 100644 --- a/metricsd/uploader/system_profile_cache.h +++ b/metricsd/uploader/system_profile_cache.h @@ -19,12 +19,12 @@ #include +#include #include #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_ptr.h" #include "persistent_integer.h" #include "uploader/proto/system_profile.pb.h" #include "uploader/system_profile_setter.h" @@ -80,7 +80,7 @@ class SystemProfileCache : public SystemProfileSetter { bool initialized_; bool testing_; base::FilePath metrics_directory_; - scoped_ptr session_id_; + std::unique_ptr session_id_; SystemProfile profile_; }; diff --git a/metricsd/uploader/upload_service.cc b/metricsd/uploader/upload_service.cc index ea8427ab9..2fb30c3ee 100644 --- a/metricsd/uploader/upload_service.cc +++ b/metricsd/uploader/upload_service.cc @@ -18,6 +18,7 @@ #include +#include #include #include @@ -169,7 +170,7 @@ void UploadService::StageCurrentLog() { if (!current_log_) return; - scoped_ptr staged_log; + std::unique_ptr staged_log; staged_log.swap(current_log_); staged_log->CloseLog(); if (!staged_log->PopulateSystemProfile(system_profile_setter_.get())) { diff --git a/metricsd/uploader/upload_service.h b/metricsd/uploader/upload_service.h index fe064b890..1d36121cf 100644 --- a/metricsd/uploader/upload_service.h +++ b/metricsd/uploader/upload_service.h @@ -17,6 +17,7 @@ #ifndef METRICS_UPLOADER_UPLOAD_SERVICE_H_ #define METRICS_UPLOADER_UPLOAD_SERVICE_H_ +#include #include #include @@ -141,11 +142,11 @@ class UploadService : public base::HistogramFlattener, public brillo::Daemon { // Returns the current log. If there is no current log, creates it first. MetricsLog* GetOrCreateCurrentLog(); - scoped_ptr system_profile_setter_; + std::unique_ptr system_profile_setter_; base::HistogramSnapshotManager histogram_snapshot_manager_; - scoped_ptr sender_; + std::unique_ptr sender_; chromeos_metrics::PersistentInteger failed_upload_count_; - scoped_ptr current_log_; + std::unique_ptr current_log_; std::shared_ptr counters_; base::TimeDelta upload_interval_; diff --git a/metricsd/uploader/upload_service_test.cc b/metricsd/uploader/upload_service_test.cc index 0e2ba8fba..ec507e878 100644 --- a/metricsd/uploader/upload_service_test.cc +++ b/metricsd/uploader/upload_service_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include @@ -23,6 +23,7 @@ #include #include #include +#include #include "constants.h" #include "persistent_integer.h" @@ -86,15 +87,15 @@ class UploadServiceTest : public testing::Test { } const metrics::SystemProfileProto_Stability GetCurrentStability() { - EXPECT_TRUE(upload_service_->current_log_); + EXPECT_TRUE(upload_service_->current_log_.get()); return upload_service_->current_log_->uma_proto()->system_profile().stability(); } base::ScopedTempDir dir_; - scoped_ptr upload_service_; + std::unique_ptr upload_service_; - scoped_ptr exit_manager_; + std::unique_ptr exit_manager_; std::shared_ptr counters_; };