From c99a95b7f39df01b7367c9f056ccc5f3e3bca91d Mon Sep 17 00:00:00 2001
From: wuzhihuitmac <wuzhihui4@huawei.com>
Date: Sat, 9 Aug 2025 12:00:20 +0800
Subject: [PATCH] Modify lock scope

Signed-off-by: wuzhihuitmac <wuzhihui4@huawei.com>
Change-Id: Ie0b815e177c507236be95bfb1d9f9740b9ba612b
---
 .../adapter/src/hdi_connection.cpp            | 67 ++++++++++---------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/services/hdi_connection/adapter/src/hdi_connection.cpp b/services/hdi_connection/adapter/src/hdi_connection.cpp
index 1e0fadab..2303ae0e 100644
--- a/services/hdi_connection/adapter/src/hdi_connection.cpp
+++ b/services/hdi_connection/adapter/src/hdi_connection.cpp
@@ -235,30 +235,32 @@ int32_t HdiConnection::RegisterDataReport(ReportDataCb cb, sptr<ReportDataCallba
 int32_t HdiConnection::DestroyHdiConnection()
 {
     CALL_LOG_ENTER;
-    std::lock_guard<std::mutex> sensorInterface(g_sensorInterfaceMutex);
-    CHKPR(g_sensorInterface, ERR_NO_INIT);
-    SensorXcollie unregisterAsyncXcollie("HdiConnection:UnregisterAsync", XCOLLIE_TIMEOUT_5S);
-    int32_t ret = g_sensorInterface->UnregisterAsync(0, g_eventCallback);
-    if (ret != 0) {
+    {
+        std::lock_guard<std::mutex> sensorInterface(g_sensorInterfaceMutex);
+        CHKPR(g_sensorInterface, ERR_NO_INIT);
+        SensorXcollie unregisterAsyncXcollie("HdiConnection:UnregisterAsync", XCOLLIE_TIMEOUT_5S);
+        int32_t ret = g_sensorInterface->UnregisterAsync(0, g_eventCallback);
+        if (ret != 0) {
 #ifdef HIVIEWDFX_HISYSEVENT_ENABLE
-        HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION",
-            HiSysEvent::EventType::FAULT, "PKG_NAME", "DestroyHdiConnection", "ERROR_CODE", ret);
+            HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION",
+                HiSysEvent::EventType::FAULT, "PKG_NAME", "DestroyHdiConnection", "ERROR_CODE", ret);
 #endif // HIVIEWDFX_HISYSEVENT_ENABLE
-        SEN_HILOGE("UnregisterAsync is failed");
-        return ret;
-    }
-    SensorXcollie unRegSensorPlugCallBackXcollie("HdiConnection:UnRegSensorPlugCallBack", XCOLLIE_TIMEOUT_5S);
-    ret = g_sensorInterface->UnRegSensorPlugCallBack(g_plugCallback);
-    if (ret != 0) {
+            SEN_HILOGE("UnregisterAsync is failed");
+            return ret;
+        }
+        SensorXcollie unRegSensorPlugCallBackXcollie("HdiConnection:UnRegSensorPlugCallBack", XCOLLIE_TIMEOUT_5S);
+        ret = g_sensorInterface->UnRegSensorPlugCallBack(g_plugCallback);
+        if (ret != 0) {
 #ifdef HIVIEWDFX_HISYSEVENT_ENABLE
-        HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION",
-            HiSysEvent::EventType::FAULT, "PKG_NAME", "UnRegSensorPlugCallback", "ERROR_CODE", ret);
+            HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION",
+                HiSysEvent::EventType::FAULT, "PKG_NAME", "UnRegSensorPlugCallback", "ERROR_CODE", ret);
 #endif // HIVIEWDFX_HISYSEVENT_ENABLE
-        SEN_HILOGE("UnRegSensorPlugCallback is failed");
-        return ret;
+            SEN_HILOGE("UnRegSensorPlugCallback is failed");
+            return ret;
+        }
+        g_plugCallback = nullptr;
+        g_eventCallback = nullptr;
     }
-    g_plugCallback = nullptr;
-    g_eventCallback = nullptr;
     UnregisterHdiDeathRecipient();
     return ERR_OK;
 }
@@ -424,18 +426,20 @@ void HdiConnection::Reconnect()
         SEN_HILOGE("Failed to get an instance of hdi service");
         return;
     }
-    SensorXcollie registerXcollie("HdiConnection:Reconnect:RegisterAsync", XCOLLIE_TIMEOUT_5S);
-    std::lock_guard<std::mutex> sensorInterface(g_sensorInterfaceMutex);
-    ret = g_sensorInterface->RegisterAsync(0, g_eventCallback);
-    if (ret != 0) {
-        SEN_HILOGE("RegisterAsync callback fail");
-        return;
-    }
-    SensorXcollie regSensorPlugCallBackXcollie("HdiConnection:Reconnect:RegSensorPlugCallBack", XCOLLIE_TIMEOUT_5S);
-    ret = g_sensorInterface->RegSensorPlugCallBack(g_plugCallback);
-    if (ret != 0) {
-        SEN_HILOGE("RegisterAsync plug callback fail");
-        return;
+    {
+        std::lock_guard<std::mutex> sensorInterface(g_sensorInterfaceMutex);
+        SensorXcollie registerXcollie("HdiConnection:Reconnect:RegisterAsync", XCOLLIE_TIMEOUT_5S);
+        ret = g_sensorInterface->RegisterAsync(0, g_eventCallback);
+        if (ret != 0) {
+            SEN_HILOGE("RegisterAsync callback fail");
+            return;
+        }
+        SensorXcollie regSensorPlugCallBackXcollie("HdiConnection:Reconnect:RegSensorPlugCallBack", XCOLLIE_TIMEOUT_5S);
+        ret = g_sensorInterface->RegSensorPlugCallBack(g_plugCallback);
+        if (ret != 0) {
+            SEN_HILOGE("RegisterAsync plug callback fail");
+            return;
+        }
     }
     std::vector<Sensor> sensorList;
     ret = GetSensorList(sensorList);
@@ -443,6 +447,7 @@ void HdiConnection::Reconnect()
         SEN_HILOGE("Get sensor list fail");
         return;
     }
+    std::lock_guard<std::mutex> sensorInterface(g_sensorInterfaceMutex);
     ReEnableSensor();
 }
 
-- 
Gitee