diff --git a/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h b/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h index 2d68ce333424e95338069f8ae117baf786a87c5c..5b681871181b183be7e1f3af4c0a9b79d2dc6fdf 100644 --- a/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h +++ b/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h @@ -35,6 +35,7 @@ public: AccessManager &operator = (const AccessManager &) = delete; AccessManager(AccessManager &&) = delete; AccessManager &operator = (AccessManager &&) = delete; + AccessManager() = default; virtual ~AccessManager(); static std::shared_ptr GetInstance(); int32_t Init(); @@ -50,7 +51,6 @@ public: int32_t Dump(const std::vector &argsStr, std::string &result); private: - AccessManager() = default; int32_t RegisterDevStateCallback(); int32_t UnRegisterDevStateCallback(); int32_t InitDeviceManager(); diff --git a/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h index 24420a9dc7bea04c8f27e690eb8847e5b4be9a72..ca9cec7a6c8cd2fa89d7a18c9900160f4efa6c20 100644 --- a/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h +++ b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h @@ -38,6 +38,7 @@ public: CapabilityInfoManager(CapabilityInfoManager &&) = delete; CapabilityInfoManager &operator = (CapabilityInfoManager &&) = delete; static std::shared_ptr GetInstance(); + CapabilityInfoManager(); virtual ~CapabilityInfoManager(); int32_t Init(); int32_t UnInit(); @@ -91,7 +92,6 @@ public: void DumpCapabilityInfos(std::vector &capInfos); private: - CapabilityInfoManager(); void HandleCapabilityAddChange(const std::vector &insertRecords); void HandleCapabilityUpdateChange(const std::vector &updateRecords); void HandleCapabilityDeleteChange(const std::vector &deleteRecords); diff --git a/services/distributedhardwarefwkservice/include/resourcemanager/local_capability_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/local_capability_info_manager.h index b51c2d5b85b603d9392182ab959f8df4a2ca8921..3cea4064093309a1215afe71921dbbb9c08ac609 100644 --- a/services/distributedhardwarefwkservice/include/resourcemanager/local_capability_info_manager.h +++ b/services/distributedhardwarefwkservice/include/resourcemanager/local_capability_info_manager.h @@ -37,6 +37,7 @@ public: LocalCapabilityInfoManager(LocalCapabilityInfoManager &&) = delete; LocalCapabilityInfoManager &operator = (LocalCapabilityInfoManager &&) = delete; static std::shared_ptr GetInstance(); + LocalCapabilityInfoManager(); virtual ~LocalCapabilityInfoManager(); int32_t Init(); int32_t UnInit(); @@ -57,9 +58,6 @@ public: /* Queries batch records in the database based on the prefix of the key. */ int32_t GetDataByKeyPrefix(const std::string &keyPrefix, CapabilityInfoMap &capabilityMap); -private: - LocalCapabilityInfoManager(); - private: mutable std::mutex capInfoMgrMutex_; std::shared_ptr dbAdapterPtr_; diff --git a/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h index 1fe71e9c4abbf3e29af80bb82d5561477cb9f9e1..bb9b416dc396c518e8a6cf0daa01831d2c0e2cbc 100644 --- a/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h +++ b/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h @@ -36,6 +36,7 @@ public: MetaInfoManager(MetaInfoManager &&) = delete; MetaInfoManager &operator = (MetaInfoManager &&) = delete; static std::shared_ptr GetInstance(); + MetaInfoManager(); virtual ~MetaInfoManager(); int32_t Init(); int32_t UnInit(); @@ -65,7 +66,6 @@ public: std::shared_ptr GetEventHandler(); private: - MetaInfoManager(); int32_t GetMetaCapByValue(const std::string &value, std::shared_ptr &metaCapPtr); void HandleMetaCapabilityAddChange(const std::vector &insertRecords); void HandleMetaCapabilityUpdateChange(const std::vector &updateRecords); diff --git a/services/distributedhardwarefwkservice/include/resourcemanager/version_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/version_info_manager.h index 53cedfd3e44bbf990a2f4439e1ccf234d563020e..7f15377807744d13ac925627ea1ed6400139bc1f 100644 --- a/services/distributedhardwarefwkservice/include/resourcemanager/version_info_manager.h +++ b/services/distributedhardwarefwkservice/include/resourcemanager/version_info_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,6 +40,7 @@ public: VersionInfoManager(VersionInfoManager &&) = delete; VersionInfoManager &operator = (VersionInfoManager &&) = delete; static std::shared_ptr GetInstance(); + VersionInfoManager(); virtual ~VersionInfoManager(); int32_t Init(); @@ -64,7 +65,6 @@ public: std::shared_ptr GetEventHandler(); private: - VersionInfoManager(); void UpdateVersionCache(const VersionInfo &versionInfo); void HandleVersionAddChange(const std::vector &insertRecords); void HandleVersionUpdateChange(const std::vector &updateRecords); diff --git a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp index 32b974cc6abaf5780c119bfb192613cdad938f82..d51862f5676e33b0d3ca9e08bb7dd4163ab8f596 100644 --- a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp +++ b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp @@ -43,11 +43,7 @@ AccessManager::~AccessManager() std::shared_ptr AccessManager::GetInstance() { - static std::shared_ptr instance(new(std::nothrow) AccessManager); - if (instance == nullptr) { - DHLOGE("instance is nullptr, because applying memory fail!"); - return nullptr; - } + static std::shared_ptr instance = std::make_shared(); return instance; } diff --git a/services/distributedhardwarefwkservice/src/lowlatency/low_latency.cpp b/services/distributedhardwarefwkservice/src/lowlatency/low_latency.cpp index d8a6ba67e9246fec25c3340d89134a194106fe1a..f6fd7d6dd00a8cf53f682e2b81ba121814ea68f8 100644 --- a/services/distributedhardwarefwkservice/src/lowlatency/low_latency.cpp +++ b/services/distributedhardwarefwkservice/src/lowlatency/low_latency.cpp @@ -87,9 +87,9 @@ void LowLatency::CloseLowLatency() DHLOGI("Shutdown LowLatency"); std::lock_guard lock(lowLatencyMutex_); lowLatencySwitchSet_.clear(); - auto &rssClient = OHOS::ResourceSchedule::ResSchedClient::GetInstance(); // to restore normal latency mode: value = 1 - rssClient.ReportData(OHOS::ResourceSchedule::ResType::RES_TYPE_NETWORK_LATENCY_REQUEST, MODE_DISABLE, + OHOS::ResourceSchedule::ResSchedClient::GetInstance().ReportData( + OHOS::ResourceSchedule::ResType::RES_TYPE_NETWORK_LATENCY_REQUEST, MODE_DISABLE, {{LOW_LATENCY_KEY, DH_FWK_PKG_NAME}}); } } // namespace DistributedHardware diff --git a/services/distributedhardwarefwkservice/src/lowlatency/low_latency_timer.cpp b/services/distributedhardwarefwkservice/src/lowlatency/low_latency_timer.cpp index ddac02509c9da66d0de3c24193d84b2ce15cbfd4..c924d61108f1980914f8ee47d3c9532d49c0f113 100644 --- a/services/distributedhardwarefwkservice/src/lowlatency/low_latency_timer.cpp +++ b/services/distributedhardwarefwkservice/src/lowlatency/low_latency_timer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -39,18 +39,18 @@ LowLatencyTimer::~LowLatencyTimer() void LowLatencyTimer::ExecuteInner() { DHLOGD("ExecuteInner"); - auto &rssClient = OHOS::ResourceSchedule::ResSchedClient::GetInstance(); // to enable low latency mode: value = 0 - rssClient.ReportData(OHOS::ResourceSchedule::ResType::RES_TYPE_NETWORK_LATENCY_REQUEST, MODE_ENABLE, + OHOS::ResourceSchedule::ResSchedClient::GetInstance().ReportData( + OHOS::ResourceSchedule::ResType::RES_TYPE_NETWORK_LATENCY_REQUEST, MODE_ENABLE, {{LOW_LATENCY_KEY, DH_FWK_PKG_NAME}}); } void LowLatencyTimer::HandleStopTimer() { DHLOGI("HandleStopTimer!"); - auto &rssClient = OHOS::ResourceSchedule::ResSchedClient::GetInstance(); // to restore normal latency mode: value = 1 - rssClient.ReportData(OHOS::ResourceSchedule::ResType::RES_TYPE_NETWORK_LATENCY_REQUEST, MODE_DISABLE, + OHOS::ResourceSchedule::ResSchedClient::GetInstance().ReportData( + OHOS::ResourceSchedule::ResType::RES_TYPE_NETWORK_LATENCY_REQUEST, MODE_DISABLE, {{LOW_LATENCY_KEY, DH_FWK_PKG_NAME}}); } } diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp index 38655f149b370f4945f553c1ec9225a7acbbf7cc..49b1805e5e35b1ca8f0ffb10ad0617c58c7c94bf 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp @@ -45,11 +45,7 @@ CapabilityInfoManager::~CapabilityInfoManager() std::shared_ptr CapabilityInfoManager::GetInstance() { - static std::shared_ptr instance(new(std::nothrow) CapabilityInfoManager); - if (instance == nullptr) { - DHLOGE("instance is nullptr, because applying memory fail!"); - return nullptr; - } + static std::shared_ptr instance = std::make_shared(); return instance; } diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/local_capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/local_capability_info_manager.cpp index 6f46a84deacc127d569f2ac8c854c825b6021e95..0d7d01dde014da1acf8d95d78cfc65afef20dfa7 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/local_capability_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/local_capability_info_manager.cpp @@ -43,11 +43,7 @@ LocalCapabilityInfoManager::~LocalCapabilityInfoManager() std::shared_ptr LocalCapabilityInfoManager::GetInstance() { - static std::shared_ptr instance(new(std::nothrow) LocalCapabilityInfoManager); - if (instance == nullptr) { - DHLOGE("instance is nullptr, because applying memory fail!"); - return nullptr; - } + static std::shared_ptr instance = std::make_shared(); return instance; } diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp index 05281267083373807c6a0ad2c1c8e0fdb3bc2916..a6435cfc8e72912ae83a7626b5ba9be0d22c83ee 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp @@ -45,11 +45,7 @@ MetaInfoManager::~MetaInfoManager() std::shared_ptr MetaInfoManager::GetInstance() { - static std::shared_ptr instance(new(std::nothrow) MetaInfoManager); - if (instance == nullptr) { - DHLOGE("instance is nullptr, because applying memory fail!"); - return nullptr; - } + static std::shared_ptr instance = std::make_shared(); return instance; } diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp index bc90781ed02a23314b9a0b2dc7bd24c2dcddd0e1..77248e7eb6271f243c36403ec2d72c5907288060 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp @@ -73,11 +73,7 @@ std::shared_ptr VersionInfoM std::shared_ptr VersionInfoManager::GetInstance() { - static std::shared_ptr instance(new(std::nothrow) VersionInfoManager); - if (instance == nullptr) { - DHLOGE("instance is nullptr, because applying memory fail!"); - return nullptr; - } + static std::shared_ptr instance = std::make_shared(); return instance; } diff --git a/services/distributedhardwarefwkservice/src/transport/dh_comm_tool.cpp b/services/distributedhardwarefwkservice/src/transport/dh_comm_tool.cpp index 38bb6070d65541a1b04851ea9fe969583977955d..6a9a980e3b4c30271e8250042fa26af5243f2611 100644 --- a/services/distributedhardwarefwkservice/src/transport/dh_comm_tool.cpp +++ b/services/distributedhardwarefwkservice/src/transport/dh_comm_tool.cpp @@ -59,11 +59,7 @@ void DHCommTool::UnInit() std::shared_ptr DHCommTool::GetInstance() { - static std::shared_ptr instance(new(std::nothrow) DHCommTool); - if (instance == nullptr) { - DHLOGE("instance is nullptr, because applying memory fail!"); - return nullptr; - } + static std::shared_ptr instance = std::make_shared(); return instance; }