openharmony/distributeddatamgr_datamgr_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_datamgr_service synced 2024-11-23 14:59:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!29 fixed the distributeddata deadlock bugs

Browse Source 
Merge pull request !29 from wangkun/master
This commit is contained in:
openharmony_ci 2021-07-23 01:29:24 +00:00 committed by Gitee
commit 19357aaf63
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp
View File

@ -201,12 +201,18 @@ Status SoftBusAdapter::StopWatchDeviceChange(const AppDeviceStatusChangeListener
void SoftBusAdapter::NotifyAll(const DeviceInfo &deviceInfo, const DeviceChangeType &type)
{
std::thread th = std::thread([this, deviceInfo, type]() {
std::lock_guard<std::mutex> lock(deviceChangeMutex_);
std::vector<const AppDeviceStatusChangeListener *> listeners;
{
std::lock_guard<std::mutex> lock(deviceChangeMutex_);
for (const auto &listener : listeners_) {
listeners.push_back(listener);
}
}
ZLOGD("high");
std::string uuid = GetUuidByNodeId(deviceInfo.deviceId);
ZLOGD("[Notify] to DB from: %{public}s, type:%{public}d", ToBeAnonymous(uuid).c_str(), type);
UpdateRelationship(deviceInfo.deviceId, type);
for (const auto &device : listeners_) {
for (const auto &device : listeners) {
if (device == nullptr) {
continue;
}
@ -217,7 +223,7 @@ void SoftBusAdapter::NotifyAll(const DeviceInfo &deviceInfo, const DeviceChangeT
}
}
ZLOGD("low");
for (const auto &device : listeners_) {
for (const auto &device : listeners) {
if (device == nullptr) {
continue;
}
@ -228,7 +234,7 @@ void SoftBusAdapter::NotifyAll(const DeviceInfo &deviceInfo, const DeviceChangeT
}
}
ZLOGD("min");
for (const auto &device : listeners_) {
for (const auto &device : listeners) {
if (device == nullptr) {
continue;
}