From a7fe346cfec50408870a79a645be274009dc682c Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Wed, 7 Aug 2024 11:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9cooddy726=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../include/accessmanager/access_manager.h | 2 +- .../include/resourcemanager/capability_info_manager.h | 2 +- .../resourcemanager/local_capability_info_manager.h | 4 +--- .../include/resourcemanager/meta_info_manager.h | 2 +- .../include/resourcemanager/version_info_manager.h | 4 ++-- .../src/accessmanager/access_manager.cpp | 6 +----- .../src/lowlatency/low_latency.cpp | 4 ++-- .../src/lowlatency/low_latency_timer.cpp | 10 +++++----- .../src/resourcemanager/capability_info_manager.cpp | 6 +----- .../resourcemanager/local_capability_info_manager.cpp | 6 +----- .../src/resourcemanager/meta_info_manager.cpp | 6 +----- .../src/resourcemanager/version_info_manager.cpp | 6 +----- .../src/transport/dh_comm_tool.cpp | 6 +----- 13 files changed, 19 insertions(+), 45 deletions(-) diff --git a/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h b/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h index 2d68ce33..5b681871 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 24420a9d..ca9cec7a 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 b51c2d5b..3cea4064 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 1fe71e9c..bb9b416d 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 53cedfd3..7f153778 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 32b974cc..d51862f5 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 d8a6ba67..f6fd7d6d 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 ddac0250..c924d611 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 38655f14..49b1805e 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 6f46a84d..0d7d01dd 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 05281267..a6435cfc 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 bc90781e..77248e7e 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 38bb6070..6a9a980e 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; } -- Gitee