Clean up non-standard unique_ptr initializations in tlbmc & hft #cleanup PiperOrigin-RevId: 971397832 Change-Id: I9212a1c407030e3385c6b58946789beea2e34517
diff --git a/tlbmc/adapter/data_source.h b/tlbmc/adapter/data_source.h index 7354ca5..d4da312 100644 --- a/tlbmc/adapter/data_source.h +++ b/tlbmc/adapter/data_source.h
@@ -11,6 +11,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/substitute.h" @@ -192,7 +193,7 @@ DataSource::CreateSensorMutationBatch( SubscriptionPolicy::ResourceType /*resource_type*/, std::vector<Identifier> identifiers) { - return std::unique_ptr<SensorMutationBatch>( + return absl::WrapUnique( new SensorMutationBatch(this, std::move(identifiers))); }
diff --git a/tlbmc/collector/fru_collector.cc b/tlbmc/collector/fru_collector.cc index ad16b17..fa1adec 100644 --- a/tlbmc/collector/fru_collector.cc +++ b/tlbmc/collector/fru_collector.cc
@@ -20,6 +20,7 @@ #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" #include "absl/log/log.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/ascii.h" @@ -592,7 +593,7 @@ // If cached FRU table is present, use it, and will not scan any fixed FRUs, // nor write cached FRU to file. if (cached_fru_table.has_value()) { - return std::unique_ptr<FruCollector>(new FruCollector( + return absl::WrapUnique(new FruCollector( std::move(options), std::move(*cached_fru_table), std::make_shared<TaskScheduler>(), std::move(resource_state_managers))); } @@ -689,7 +690,7 @@ WriteCachedFru(fru_table, options.cached_fru_table_path); - return std::unique_ptr<FruCollector>(new FruCollector( + return absl::WrapUnique(new FruCollector( std::move(options), std::move(fru_table), std::make_shared<TaskScheduler>(), std::move(resource_state_managers))); }
diff --git a/tlbmc/collector/led_collector.cc b/tlbmc/collector/led_collector.cc index 9106f96..6134020 100644 --- a/tlbmc/collector/led_collector.cc +++ b/tlbmc/collector/led_collector.cc
@@ -7,6 +7,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/log.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -73,7 +74,7 @@ } } - return std::unique_ptr<LedCollector>(new LedCollector( + return absl::WrapUnique(new LedCollector( std::move(task_scheduler), std::move(leds), std::move(presets))); }
diff --git a/tlbmc/collector/pcie_collector.h b/tlbmc/collector/pcie_collector.h index ece49a6..32fe036 100644 --- a/tlbmc/collector/pcie_collector.h +++ b/tlbmc/collector/pcie_collector.h
@@ -3,6 +3,7 @@ #include <memory> +#include "absl/memory/memory.h" #include "absl/status/statusor.h" #include <nlohmann/json.hpp> #include "tlbmc/collector/collector.h" @@ -44,7 +45,7 @@ class EmptyPcieCollector final : public PcieCollector { public: static std::unique_ptr<EmptyPcieCollector> Create() { - return std::unique_ptr<EmptyPcieCollector>(new EmptyPcieCollector()); + return absl::WrapUnique(new EmptyPcieCollector()); } nlohmann::json ToJson() const override;
diff --git a/tlbmc/collector/power_control_collector.cc b/tlbmc/collector/power_control_collector.cc index f5be996..198cfa6 100644 --- a/tlbmc/collector/power_control_collector.cc +++ b/tlbmc/collector/power_control_collector.cc
@@ -8,6 +8,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" #include "absl/log/log.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -189,7 +190,7 @@ } } - return std::unique_ptr<PowerControlCollector>( + return absl::WrapUnique( new PowerControlCollector(std::move(params), std::move(power_controls))); }
diff --git a/tlbmc/collector/power_control_collector.h b/tlbmc/collector/power_control_collector.h index 2eb38f2..fa070d3 100644 --- a/tlbmc/collector/power_control_collector.h +++ b/tlbmc/collector/power_control_collector.h
@@ -8,6 +8,7 @@ #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -80,8 +81,7 @@ class EmptyPowerControlCollector final : public PowerControlCollector { public: static std::unique_ptr<EmptyPowerControlCollector> Create() { - return std::unique_ptr<EmptyPowerControlCollector>( - new EmptyPowerControlCollector()); + return absl::WrapUnique(new EmptyPowerControlCollector()); } PowerControl* GetPowerControl(
diff --git a/tlbmc/collector/sensor_collector.cc b/tlbmc/collector/sensor_collector.cc index 9fb02c2..84c90a8 100644 --- a/tlbmc/collector/sensor_collector.cc +++ b/tlbmc/collector/sensor_collector.cc
@@ -14,6 +14,7 @@ #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" #include "absl/log/log.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/match.h" @@ -1295,7 +1296,7 @@ params.override_sensor_sampling_interval_ms, *thread_manager); // Create the SensorCollector instance first. - std::unique_ptr<SensorCollector> collector(new SensorCollector( + auto collector = absl::WrapUnique(new SensorCollector( std::move(sensors), std::move(bus_to_v1_accessor), std::move(bus_to_v2_accessor), std::move(bus_to_v4_accessor), std::move(bus_to_v5_accessor), std::move(thread_manager),
diff --git a/tlbmc/metrics/software_metrics.cc b/tlbmc/metrics/software_metrics.cc index c314b98..ec5921d 100644 --- a/tlbmc/metrics/software_metrics.cc +++ b/tlbmc/metrics/software_metrics.cc
@@ -20,6 +20,7 @@ #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" #include "absl/log/log.h" +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/ascii.h" @@ -525,8 +526,8 @@ absl::string_view psi_base_path, absl::string_view root_path) { SoftwareMetricsAttributesStatic software_attributes_static = CreateStaticAttributes(config); - std::unique_ptr<SoftwareMetrics> ptr(new SoftwareMetrics( - software_attributes_static, psi_base_path, root_path)); + auto ptr = absl::WrapUnique(new SoftwareMetrics(software_attributes_static, + psi_base_path, root_path)); return ptr; } @@ -541,9 +542,8 @@ absl::string_view root_path) { SoftwareMetricsAttributesStatic software_attributes_static = CreateStaticAttributes(config); - std::unique_ptr<SoftwareMetrics> ptr(new SoftwareMetrics( - software_attributes_static, psi_base_path, root_path)); - return ptr; + return absl::WrapUnique(new SoftwareMetrics(software_attributes_static, + psi_base_path, root_path)); } void SoftwareMetrics::RefreshOnce(absl::AnyInvocable<void()> callback) {