From 1737898e8f675b79140bd05d32e064be64c8a819 Mon Sep 17 00:00:00 2001
From: lixiangpeng5 <lixiangpeng5@huawei.com>
Date: Fri, 25 Oct 2024 12:58:46 +0000
Subject: [PATCH] fix lock for UnsubscribeSensor

Signed-off-by: lixiangpeng5 <lixiangpeng5@huawei.com>
Change-Id: I6943046392e73bade51790322da96c6756416ae4
---
 .../native/include/sensor_agent_proxy.h       |  1 +
 frameworks/native/src/sensor_agent_proxy.cpp  | 36 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/frameworks/native/include/sensor_agent_proxy.h b/frameworks/native/include/sensor_agent_proxy.h
index b5258f7d..5d58e112 100644
--- a/frameworks/native/include/sensor_agent_proxy.h
+++ b/frameworks/native/include/sensor_agent_proxy.h
@@ -58,6 +58,7 @@ private:
     int32_t ConvertSensorInfos() const;
     void ClearSensorInfos() const;
     std::set<RecordSensorCallback> GetSubscribeUserCallback(int32_t sensorId);
+    bool IsSubscribeMapEmpty() const;
     static std::recursive_mutex subscribeMutex_;
     static std::mutex chanelMutex_;
     OHOS::sptr<OHOS::Sensors::SensorDataChannel> dataChannel_ = nullptr;
diff --git a/frameworks/native/src/sensor_agent_proxy.cpp b/frameworks/native/src/sensor_agent_proxy.cpp
index 53b1715e..0d0fd18a 100644
--- a/frameworks/native/src/sensor_agent_proxy.cpp
+++ b/frameworks/native/src/sensor_agent_proxy.cpp
@@ -265,6 +265,12 @@ int32_t SensorAgentProxy::SubscribeSensor(int32_t sensorId, const SensorUser *us
     return OHOS::Sensors::SUCCESS;
 }
 
+bool SensorAgentProxy::IsSubscribeMapEmpty() const
+{
+    std::lock_guard<std::recursive_mutex> subscribeLock(subscribeMutex_);
+    return subscribeMap_.empty();
+}
+
 int32_t SensorAgentProxy::UnsubscribeSensor(int32_t sensorId, const SensorUser *user)
 {
     SEN_HILOGI("In, sensorId:%{public}d", sensorId);
@@ -274,27 +280,29 @@ int32_t SensorAgentProxy::UnsubscribeSensor(int32_t sensorId, const SensorUser *
         SEN_HILOGE("sensorId is invalid, %{public}d", sensorId);
         return PARAMETER_ERROR;
     }
-    std::lock_guard<std::recursive_mutex> subscribeLock(subscribeMutex_);
-    if (unsubscribeMap_.find(sensorId) == unsubscribeMap_.end()) {
-        SEN_HILOGE("Deactivate sensorId first");
-        return OHOS::Sensors::ERROR;
-    }
-    auto& unsubscribeSet = unsubscribeMap_[sensorId];
-    if (unsubscribeSet.find(user) == unsubscribeSet.end()) {
-        SEN_HILOGE("Deactivate user first");
-        return OHOS::Sensors::ERROR;
+    {
+        std::lock_guard<std::recursive_mutex> subscribeLock(subscribeMutex_);
+        if (unsubscribeMap_.find(sensorId) == unsubscribeMap_.end()) {
+            SEN_HILOGE("Deactivate sensorId first");
+            return OHOS::Sensors::ERROR;
+        }
+        auto& unsubscribeSet = unsubscribeMap_[sensorId];
+        if (unsubscribeSet.find(user) == unsubscribeSet.end()) {
+            SEN_HILOGE("Deactivate user first");
+            return OHOS::Sensors::ERROR;
+        }
+        unsubscribeSet.erase(user);
+        if (unsubscribeSet.empty()) {
+            unsubscribeMap_.erase(sensorId);
+        }
     }
-    if (subscribeMap_.empty()) {
+    if (IsSubscribeMapEmpty()) {
         int32_t ret = DestroySensorDataChannel();
         if (ret != ERR_OK) {
             SEN_HILOGE("Destroy data channel fail, ret:%{public}d", ret);
             return ret;
         }
     }
-    unsubscribeSet.erase(user);
-    if (unsubscribeSet.empty()) {
-        unsubscribeMap_.erase(sensorId);
-    }
     if (PrintSensorData::GetInstance().IsContinuousType(sensorId)) {
         PrintSensorData::GetInstance().RemovePrintUserInfo(user->callback);
     }
-- 
Gitee