From 32597f42eff96e6509d90fd53fa3016d3cba69ab Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 9 Sep 2022 11:26:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9init=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/distributed_hardware_manager.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp index ff4cbc92..24681582 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp @@ -54,18 +54,19 @@ IMPLEMENT_SINGLE_INSTANCE(DistributedHardwareManager); int32_t DistributedHardwareManager::Initialize() { DHLOGI("start"); - CapabilityInfoManager::GetInstance()->Init(); VersionInfoManager::GetInstance()->Init(); ComponentLoader::GetInstance().Init(); - LocalHardwareManager::GetInstance().Init(); - VersionManager::GetInstance().Init(); ComponentManager::GetInstance().Init(); + CapabilityInfoManager::GetInstance()->Init(); + + LocalHardwareManager::GetInstance().Init(); + return DH_FWK_SUCCESS; } @@ -74,18 +75,18 @@ int32_t DistributedHardwareManager::Release() DHLOGI("start"); TaskBoard::GetInstance().WaitForALLTaskFinish(); - ComponentManager::GetInstance().UnInit(); - - VersionManager::GetInstance().UnInit(); - - LocalHardwareManager::GetInstance().UnInit(); + VersionInfoManager::GetInstance()->UnInit(); ComponentLoader::GetInstance().UnInit(); - VersionInfoManager::GetInstance()->UnInit(); + VersionManager::GetInstance().UnInit(); + + ComponentManager::GetInstance().UnInit(); CapabilityInfoManager::GetInstance()->UnInit(); + LocalHardwareManager::GetInstance().UnInit(); + return DH_FWK_SUCCESS; } -- Gitee From 07ea340372b9fe9b3049fa7573a947d61f048816 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 15 Sep 2022 10:45:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9init=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/componentloader/component_loader.cpp | 2 +- .../src/distributed_hardware_manager.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index 0188d461..09e20ad6 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -184,7 +184,7 @@ void ComponentLoader::GetAllHandler(std::map &dhtypeMap) comHandler.hardwareHandler = GetHandler(itor->second.compHandlerLoc); comHandler.sinkHandler = GetHandler(itor->second.compSinkLoc); comHandler.sourceHandler = GetHandler(itor->second.compSourceLoc); - compHandlerMap_.insert(std::pair(itor->second.type, comHandler)); + compHandlerMap_[itor->second.type] = comHandler; } } diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp index 24681582..11da1172 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp @@ -75,17 +75,17 @@ int32_t DistributedHardwareManager::Release() DHLOGI("start"); TaskBoard::GetInstance().WaitForALLTaskFinish(); - VersionInfoManager::GetInstance()->UnInit(); - - ComponentLoader::GetInstance().UnInit(); + LocalHardwareManager::GetInstance().UnInit(); - VersionManager::GetInstance().UnInit(); + CapabilityInfoManager::GetInstance()->UnInit(); ComponentManager::GetInstance().UnInit(); - CapabilityInfoManager::GetInstance()->UnInit(); + VersionManager::GetInstance().UnInit(); - LocalHardwareManager::GetInstance().UnInit(); + ComponentLoader::GetInstance().UnInit(); + + VersionInfoManager::GetInstance()->UnInit(); return DH_FWK_SUCCESS; } -- Gitee