From 3b5039c5de148d9d418ceb75d2654542e971679f Mon Sep 17 00:00:00 2001 From: cff-gite Date: Thu, 29 Aug 2024 11:33:00 +0800 Subject: [PATCH 1/2] Add miscDeviceIdMap mutex Signed-off-by: cff-gite Change-Id: Ibf44aa62aa7f3b7fe92928fc5db605bcbaa13be7 --- services/miscdevice_service/src/miscdevice_service.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index dd8a369..9a5510f 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -188,6 +188,7 @@ void MiscdeviceService::OnStart() MISC_HILOGE("Publish MiscdeviceService failed"); return; } + std::lock_guard lock(miscDeviceIdMapMutex_); auto ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); if (!ret.second) { MISC_HILOGI("Light exist in miscDeviceIdMap_"); @@ -218,6 +219,7 @@ void MiscdeviceService::OnStartFuzz() if (!InitLightInterface()) { MISC_HILOGE("InitLightInterface failed"); } + std::lock_guard lock(miscDeviceIdMapMutex_); auto ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); if (!ret.second) { MISC_HILOGI("Light exist in miscDeviceIdMap_"); -- Gitee From f610c0e93ae4d88951d8d6924ef6ae0fc19a6251 Mon Sep 17 00:00:00 2001 From: cff-gite Date: Thu, 29 Aug 2024 15:24:07 +0800 Subject: [PATCH 2/2] Add miscDeviceIdMap mutex Signed-off-by: cff-gite Change-Id: I2a75be11012d95b956c87d94b48139b6a753c3f5 --- services/miscdevice_service/include/miscdevice_service.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index d30d3f9..07b0b54 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -119,6 +119,7 @@ private: std::mutex clientDeathObserverMutex_; std::map, int32_t> clientPidMap_; std::mutex clientPidMapMutex_; + std::mutex miscDeviceIdMapMutex_; }; } // namespace Sensors } // namespace OHOS -- Gitee