openharmony/deviceprofile_device_info_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/deviceprofile_device_info_manager synced 2024-11-23 07:30:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改条件竞争告警

Browse Source 
Signed-off-by: torrizo <lishenhao2@huawei.com>
This commit is contained in:
torrizo 2024-10-11 15:16:37 +00:00 committed by Gitee
parent 97177cdc26
commit c9bbe467b2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
old/services/core/src/devicemanager/dp_device_manager.cpp
View File

@ -53,10 +53,19 @@ IMPLEMENT_SINGLE_INSTANCE(DpDeviceManager);
bool DpDeviceManager::Init()
{
initCallback_ = std::make_shared<DeviceInitCallBack>();
stateCallback_ = std::make_shared<DpDeviceStateCallback>();
devTrustChangeCallback_ = std::make_shared<DpDevTrustChangeCallback>();
devMgrHandler_ = DistributedDeviceProfile::EventHandlerFactory::GetInstance().GetEventHandler();
std::lock_guard<std::mutex> autoLock(callbackLock_);
if (initCallback_ == nullptr) {
initCallback_ = std::make_shared<DeviceInitCallBack>();
}
if (stateCallback_ == nullptr) {
stateCallback_ = std::make_shared<DpDeviceStateCallback>();
}
if (devTrustChangeCallback_ == nullptr) {
devTrustChangeCallback_ = std::make_shared<DpDevTrustChangeCallback>();
}
if (devMgrHandler_ == nullptr) {
devMgrHandler_ = DistributedDeviceProfile::EventHandlerFactory::GetInstance().GetEventHandler();
}
if (devMgrHandler_ == nullptr) {
return false;
}
@ -215,6 +224,7 @@ bool DpDeviceManager::ConnectDeviceManager()
int32_t retryTimes = 0;
int32_t errCode = ERR_OK;
while (retryTimes++ < MAX_TIMES_CONNECT_DEVICEMANAGER) {
std::lock_guard<std::mutex> autoLock(callbackLock_);
int32_t ret = DeviceManager::GetInstance().InitDeviceManager(PKG_NAME, initCallback_);
if (ret != 0) {
HILOGE("init device manager failed, ret:%{public}d", ret);