From 20b676e51311e099e836d892f353acd91379af38 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 29 Aug 2022 15:12:06 +0800 Subject: [PATCH 1/6] change init Signed-off-by: wanderer-dl122 --- .../src/distributed_hardware_manager.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp index ff4cbc92..27bfc524 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,16 @@ 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(); + ComponentManager::GetInstance().UnInit(); CapabilityInfoManager::GetInstance()->UnInit(); + LocalHardwareManager::GetInstance().UnInit(); + return DH_FWK_SUCCESS; } -- Gitee From a6404c5909946c7b7fb838f8ae11afd687c3f2c7 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 29 Aug 2022 18:47:45 +0800 Subject: [PATCH 2/6] change init Signed-off-by: wanderer-dl122 --- .../src/distributed_hardware_manager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp index 27bfc524..24681582 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp @@ -79,6 +79,8 @@ int32_t DistributedHardwareManager::Release() ComponentLoader::GetInstance().UnInit(); + VersionManager::GetInstance().UnInit(); + ComponentManager::GetInstance().UnInit(); CapabilityInfoManager::GetInstance()->UnInit(); -- Gitee From 2720d8c37b902d9545270dff39728ad1d8e1e572 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 31 Aug 2022 16:55:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BD=BF=E7=94=A8OnDeviceReady=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/accessmanager/access_manager.cpp | 24 +++++++++---------- .../capability_info_manager.cpp | 18 -------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp index eb93bbdb..085c7925 100644 --- a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp +++ b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp @@ -120,16 +120,8 @@ void AccessManager::OnRemoteDied() void AccessManager::OnDeviceOnline(const DmDeviceInfo &deviceInfo) { - std::lock_guard lock(accessMutex_); - DHLOGI("start, networkId = %s, deviceName = %s, deviceTypeId = %d", GetAnonyString(deviceInfo.deviceId).c_str(), - GetAnonyString(deviceInfo.deviceName).c_str(), deviceInfo.deviceTypeId); - - auto networkId = std::string(deviceInfo.deviceId); // deviceId of DM actually is networkId - auto uuid = GetUUIDBySoftBus(networkId); - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); - DHLOGI("online result = %d, networkId = %s, uuid = %s", ret, GetAnonyString(networkId).c_str(), - GetAnonyString(uuid).c_str()); + (void)deviceInfo; + return; } void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo) @@ -157,8 +149,16 @@ void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo) void AccessManager::OnDeviceReady(const DmDeviceInfo &deviceInfo) { - (void)deviceInfo; - return; + std::lock_guard lock(accessMutex_); + DHLOGI("start, networkId = %s, deviceName = %s, deviceTypeId = %d", GetAnonyString(deviceInfo.deviceId).c_str(), + GetAnonyString(deviceInfo.deviceName).c_str(), deviceInfo.deviceTypeId); + + auto networkId = std::string(deviceInfo.deviceId); // deviceId of DM actually is networkId + auto uuid = GetUUIDBySoftBus(networkId); + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); + DHLOGI("online result = %d, networkId = %s, uuid = %s", ret, GetAnonyString(networkId).c_str(), + GetAnonyString(uuid).c_str()); } void AccessManager::OnDeviceChanged(const DmDeviceInfo &deviceInfo) diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp index 4d89d592..48147f81 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp @@ -348,24 +348,6 @@ void CapabilityInfoManager::HandleCapabilityAddChange(const std::vectorGetKey(); DHLOGI("Add capability key: %s", capPtr->GetAnonymousKey().c_str()); globalCapInfoMap_[keyString] = capPtr; - std::string uuid = DHContext::GetInstance().GetUUIDByDeviceId(capPtr->GetDeviceId()); - if (uuid.empty()) { - DHLOGI("Find uuid failed and never enable"); - continue; - } - std::string networkId = DHContext::GetInstance().GetNetworkIdByUUID(uuid); - if (networkId.empty()) { - DHLOGI("Find network failed and never enable, uuid: %s", GetAnonyString(uuid).c_str()); - continue; - } - TaskParam taskParam = { - .networkId = networkId, - .uuid = uuid, - .dhId = capPtr->GetDHId(), - .dhType = capPtr->GetDHType() - }; - auto task = TaskFactory::GetInstance().CreateTask(TaskType::ENABLE, taskParam, nullptr); - TaskExecutor::GetInstance().PushTask(task); } } -- Gitee From 184dd8ad20aadb3bfca4bc4bec36c9ceeeb7a405 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 6 Sep 2022 10:42:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?ongchange=20=E4=BD=BF=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../capability_info_manager.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp index 48147f81..4d89d592 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp @@ -348,6 +348,24 @@ void CapabilityInfoManager::HandleCapabilityAddChange(const std::vectorGetKey(); DHLOGI("Add capability key: %s", capPtr->GetAnonymousKey().c_str()); globalCapInfoMap_[keyString] = capPtr; + std::string uuid = DHContext::GetInstance().GetUUIDByDeviceId(capPtr->GetDeviceId()); + if (uuid.empty()) { + DHLOGI("Find uuid failed and never enable"); + continue; + } + std::string networkId = DHContext::GetInstance().GetNetworkIdByUUID(uuid); + if (networkId.empty()) { + DHLOGI("Find network failed and never enable, uuid: %s", GetAnonyString(uuid).c_str()); + continue; + } + TaskParam taskParam = { + .networkId = networkId, + .uuid = uuid, + .dhId = capPtr->GetDHId(), + .dhType = capPtr->GetDHType() + }; + auto task = TaskFactory::GetInstance().CreateTask(TaskType::ENABLE, taskParam, nullptr); + TaskExecutor::GetInstance().PushTask(task); } } -- Gitee From 74b3e83d65f1ad87f873d1e3a2a046e9d9e292fe Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 8 Sep 2022 16:13:45 +0800 Subject: [PATCH 5/6] =?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/accessmanager/access_manager.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp index 085c7925..eb93bbdb 100644 --- a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp +++ b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp @@ -120,8 +120,16 @@ void AccessManager::OnRemoteDied() void AccessManager::OnDeviceOnline(const DmDeviceInfo &deviceInfo) { - (void)deviceInfo; - return; + std::lock_guard lock(accessMutex_); + DHLOGI("start, networkId = %s, deviceName = %s, deviceTypeId = %d", GetAnonyString(deviceInfo.deviceId).c_str(), + GetAnonyString(deviceInfo.deviceName).c_str(), deviceInfo.deviceTypeId); + + auto networkId = std::string(deviceInfo.deviceId); // deviceId of DM actually is networkId + auto uuid = GetUUIDBySoftBus(networkId); + auto ret = + DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); + DHLOGI("online result = %d, networkId = %s, uuid = %s", ret, GetAnonyString(networkId).c_str(), + GetAnonyString(uuid).c_str()); } void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo) @@ -149,16 +157,8 @@ void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo) void AccessManager::OnDeviceReady(const DmDeviceInfo &deviceInfo) { - std::lock_guard lock(accessMutex_); - DHLOGI("start, networkId = %s, deviceName = %s, deviceTypeId = %d", GetAnonyString(deviceInfo.deviceId).c_str(), - GetAnonyString(deviceInfo.deviceName).c_str(), deviceInfo.deviceTypeId); - - auto networkId = std::string(deviceInfo.deviceId); // deviceId of DM actually is networkId - auto uuid = GetUUIDBySoftBus(networkId); - auto ret = - DistributedHardwareManagerFactory::GetInstance().SendOnLineEvent(networkId, uuid, deviceInfo.deviceTypeId); - DHLOGI("online result = %d, networkId = %s, uuid = %s", ret, GetAnonyString(networkId).c_str(), - GetAnonyString(uuid).c_str()); + (void)deviceInfo; + return; } void AccessManager::OnDeviceChanged(const DmDeviceInfo &deviceInfo) -- Gitee From a905fa75df2472979da10c125e62000c7bbe1ffb Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 14 Sep 2022 19:27:22 +0800 Subject: [PATCH 6/6] =?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