From e9dc1ae401fb4b2a2b8cef4b5da2410d30f06475 Mon Sep 17 00:00:00 2001 From: wuzhihuitmac Date: Thu, 27 Oct 2022 13:01:57 +0000 Subject: [PATCH 1/4] Modify View Comments Signed-off-by: wuzhihuitmac Change-Id: Ic1df57177c6bbc85fc854a67df488d6686d6b9b2 --- .../native/sensor/src/sensor_agent_proxy.cpp | 24 ++++++++++--------- interfaces/plugin/src/sensor_js.cpp | 5 ++++ 2 files changed, 18 insertions(+), 11 deletions(-) mode change 100644 => 100755 frameworks/native/sensor/src/sensor_agent_proxy.cpp mode change 100644 => 100755 interfaces/plugin/src/sensor_js.cpp diff --git a/frameworks/native/sensor/src/sensor_agent_proxy.cpp b/frameworks/native/sensor/src/sensor_agent_proxy.cpp old mode 100644 new mode 100755 index 7b28161c..5aa48ae2 --- a/frameworks/native/sensor/src/sensor_agent_proxy.cpp +++ b/frameworks/native/sensor/src/sensor_agent_proxy.cpp @@ -300,26 +300,28 @@ int32_t SensorAgentProxy::ConvertSensorInfos() const } sensorInfos_ = (SensorInfo *)malloc(sizeof(SensorInfo) * count); CHKPR(sensorInfos_, ERROR); + SensorInfo *sensorInfo = sensorInfos_; for (size_t i = 0; i < count; ++i) { - errno_t ret = strcpy_s((sensorInfos_ + i)->sensorName, NAME_MAX_LEN, + sensorInfo += i; + errno_t ret = strcpy_s(sensorInfo->sensorName, NAME_MAX_LEN, sensorList[i].GetSensorName().c_str()); CHKCR(ret == EOK, ERROR); - ret = strcpy_s((sensorInfos_ + i)->vendorName, NAME_MAX_LEN, + ret = strcpy_s(sensorInfo->vendorName, NAME_MAX_LEN, sensorList[i].GetVendorName().c_str()); CHKCR(ret == EOK, ERROR); - ret = strcpy_s((sensorInfos_ + i)->hardwareVersion, VERSION_MAX_LEN, + ret = strcpy_s(sensorInfo->hardwareVersion, VERSION_MAX_LEN, sensorList[i].GetHardwareVersion().c_str()); CHKCR(ret == EOK, ERROR); - ret = strcpy_s((sensorInfos_ + i)->firmwareVersion, VERSION_MAX_LEN, + ret = strcpy_s(sensorInfo->firmwareVersion, VERSION_MAX_LEN, sensorList[i].GetFirmwareVersion().c_str()); CHKCR(ret == EOK, ERROR); - (sensorInfos_ + i)->sensorId = static_cast(sensorList[i].GetSensorId()); - (sensorInfos_ + i)->sensorTypeId = static_cast(sensorList[i].GetSensorTypeId()); - (sensorInfos_ + i)->maxRange = sensorList[i].GetMaxRange(); - (sensorInfos_ + i)->precision = sensorList[i].GetResolution(); - (sensorInfos_ + i)->power = sensorList[i].GetPower(); - (sensorInfos_ + i)->minSamplePeriod = sensorList[i].GetMinSamplePeriodNs(); - (sensorInfos_ + i)->maxSamplePeriod = sensorList[i].GetMaxSamplePeriodNs(); + sensorInfo->sensorId = static_cast(sensorList[i].GetSensorId()); + sensorInfo->sensorTypeId = static_cast(sensorList[i].GetSensorTypeId()); + sensorInfo->maxRange = sensorList[i].GetMaxRange(); + sensorInfo->precision = sensorList[i].GetResolution(); + sensorInfo->power = sensorList[i].GetPower(); + sensorInfo->minSamplePeriod = sensorList[i].GetMinSamplePeriodNs(); + sensorInfo->maxSamplePeriod = sensorList[i].GetMaxSamplePeriodNs(); } sensorInfoCount_ = static_cast(count); return SUCCESS; diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp old mode 100644 new mode 100755 index c87bb402..9a062419 --- a/interfaces/plugin/src/sensor_js.cpp +++ b/interfaces/plugin/src/sensor_js.cpp @@ -106,6 +106,7 @@ static void EmitSubscribeCallback(SensorEvent *event) } std::lock_guard subscribeLock(mutex_); auto callback = g_subscribeCallbacks[sensorTypeId]; + CHKPV(callback); CHKCV(copySensorData(callback, event), "Copy sensor data failed"); EmitUvEventLoop(callback); } @@ -120,6 +121,7 @@ static void EmitOnCallback(SensorEvent *event) std::lock_guard onCallbackLock(onMutex_); auto onCallbackInfos = g_onCallbackInfos[sensorTypeId]; for (auto &onCallbackInfo : onCallbackInfos) { + CHKPC(onCallbackInfo); if (!copySensorData(onCallbackInfo, event)) { SEN_HILOGE("Copy sensor data failed"); continue; @@ -138,6 +140,7 @@ static void EmitOnceCallback(SensorEvent *event) return; } for (auto &onceCallbackInfo : iter->second) { + CHKPC(onceCallbackInfo); if (!copySensorData(onceCallbackInfo, event)) { SEN_HILOGE("Copy sensor data failed"); continue; @@ -277,6 +280,7 @@ static bool IsSubscribed(napi_env env, int32_t sensorTypeId, napi_value callback continue; } napi_value sensorCallback = nullptr; + CHKPC(callbackInfo->callback[0]); CHKNRF(env, napi_get_reference_value(env, callbackInfo->callback[0], &sensorCallback), "napi_get_reference_value"); if (IsSameValue(env, callback, sensorCallback)) { @@ -365,6 +369,7 @@ static int32_t RemoveCallback(napi_env env, int32_t sensorTypeId, napi_value cal for (auto iter = callbackInfos.begin(); iter != callbackInfos.end(); ++iter) { CHKPC(*iter); napi_value sensorCallback = nullptr; + CHKPC((*iter)->callback[0]); if (napi_get_reference_value(env, (*iter)->callback[0], &sensorCallback) != napi_ok) { SEN_HILOGE("napi_get_reference_value fail"); continue; -- Gitee From 322db3ccb9f22f91b2a78c67f89785811cbe1052 Mon Sep 17 00:00:00 2001 From: wuzhihuitmac Date: Thu, 27 Oct 2022 13:03:17 +0000 Subject: [PATCH 2/4] Modify View Comments Signed-off-by: wuzhihuitmac Change-Id: I22c2e3cb8fb7f18bcc2912c86bc08a79f078b4ac --- frameworks/native/sensor/src/sensor_agent_proxy.cpp | 0 interfaces/plugin/src/sensor_js.cpp | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 frameworks/native/sensor/src/sensor_agent_proxy.cpp mode change 100755 => 100644 interfaces/plugin/src/sensor_js.cpp diff --git a/frameworks/native/sensor/src/sensor_agent_proxy.cpp b/frameworks/native/sensor/src/sensor_agent_proxy.cpp old mode 100755 new mode 100644 diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp old mode 100755 new mode 100644 -- Gitee From 6166d795e9e0f2861e9f98562043a4271d753b2f Mon Sep 17 00:00:00 2001 From: wuzhihuitmac Date: Thu, 27 Oct 2022 13:14:17 +0000 Subject: [PATCH 3/4] Modify View Comments Signed-off-by: wuzhihuitmac Change-Id: I3a8c356a0f8734c388e5c308992a95cd8837854e --- services/sensor/src/sensor_dump.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/services/sensor/src/sensor_dump.cpp b/services/sensor/src/sensor_dump.cpp index d1d298b9..63fa8276 100644 --- a/services/sensor/src/sensor_dump.cpp +++ b/services/sensor/src/sensor_dump.cpp @@ -194,6 +194,9 @@ bool SensorDump::DumpSensorList(int32_t fd, const std::vector &sensors) dprintf(fd, "Total sensor:%d, Sensor list:\n", int32_t { sensors.size() }); for (const auto &sensor : sensors) { auto sensorId = sensor.GetSensorId(); + if (sensorMap_.find(SensorId) == sensorMap_.end()) { + continue; + } dprintf(fd, "sensorId:%8u | sensorType:%s | sensorName:%s | vendorName:%s | maxRange:%f" "| fifoMaxEventCount:%d | minSamplePeriodNs:%" PRId64 " | maxSamplePeriodNs:%" PRId64 "\n", @@ -212,6 +215,9 @@ bool SensorDump::DumpSensorChannel(int32_t fd, ClientInfo &clientInfo) clientInfo.GetSensorChannelInfo(channelInfo); for (const auto &channel : channelInfo) { auto sensorId = channel.GetSensorId(); + if (sensorMap_.find(SensorId) == sensorMap_.end()) { + continue; + } dprintf(fd, "uid:%d | packageName:%s | sensorId:%8u | sensorType:%s | samplingPeriodNs:%" PRId64 "" "| fifoCount:%u\n", @@ -227,6 +233,9 @@ bool SensorDump::DumpOpeningSensor(int32_t fd, const std::vector &sensor dprintf(fd, "Opening sensors:\n"); for (const auto &sensor : sensors) { uint32_t sensorId = sensor.GetSensorId(); + if (sensorMap_.find(SensorId) == sensorMap_.end()) { + continue; + } if (clientInfo.GetSensorState(sensorId)) { dprintf(fd, "sensorId: %8u | sensorType: %s | channelSize: %lu\n", sensorId, sensorMap_[sensorId].c_str(), clientInfo.GetSensorChannel(sensorId).size()); @@ -242,6 +251,9 @@ bool SensorDump::DumpSensorData(int32_t fd, ClientInfo &clientInfo) int32_t j = 0; for (auto &sensorData : dataMap) { uint32_t sensorId = sensorData.first; + if (sensorMap_.find(SensorId) == sensorMap_.end()) { + continue; + } dprintf(fd, "sensorId: %8u | sensorType: %s:\n", sensorId, sensorMap_[sensorId].c_str()); for (uint32_t i = 0; i < MAX_DUMP_DATA_SIZE && (!sensorData.second.empty()); i++) { auto data = sensorData.second.front(); -- Gitee From aacab38cd97ae95fd8755d54f36abd0724b33985 Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Sat, 29 Oct 2022 09:52:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=8A=A0=E5=9B=BA?= =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lixiangpeng5 Change-Id: Ibd609be45aaa872576235958f0d0b1e6469a5d55 --- frameworks/native/sensor/src/sensor_agent_proxy.cpp | 3 +-- interfaces/plugin/src/sensor_js.cpp | 5 ----- services/sensor/src/sensor_dump.cpp | 8 ++++---- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/frameworks/native/sensor/src/sensor_agent_proxy.cpp b/frameworks/native/sensor/src/sensor_agent_proxy.cpp index 5aa48ae2..5db36d46 100644 --- a/frameworks/native/sensor/src/sensor_agent_proxy.cpp +++ b/frameworks/native/sensor/src/sensor_agent_proxy.cpp @@ -300,9 +300,8 @@ int32_t SensorAgentProxy::ConvertSensorInfos() const } sensorInfos_ = (SensorInfo *)malloc(sizeof(SensorInfo) * count); CHKPR(sensorInfos_, ERROR); - SensorInfo *sensorInfo = sensorInfos_; for (size_t i = 0; i < count; ++i) { - sensorInfo += i; + SensorInfo *sensorInfo = sensorInfos_ + i; errno_t ret = strcpy_s(sensorInfo->sensorName, NAME_MAX_LEN, sensorList[i].GetSensorName().c_str()); CHKCR(ret == EOK, ERROR); diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp index 9a062419..c87bb402 100644 --- a/interfaces/plugin/src/sensor_js.cpp +++ b/interfaces/plugin/src/sensor_js.cpp @@ -106,7 +106,6 @@ static void EmitSubscribeCallback(SensorEvent *event) } std::lock_guard subscribeLock(mutex_); auto callback = g_subscribeCallbacks[sensorTypeId]; - CHKPV(callback); CHKCV(copySensorData(callback, event), "Copy sensor data failed"); EmitUvEventLoop(callback); } @@ -121,7 +120,6 @@ static void EmitOnCallback(SensorEvent *event) std::lock_guard onCallbackLock(onMutex_); auto onCallbackInfos = g_onCallbackInfos[sensorTypeId]; for (auto &onCallbackInfo : onCallbackInfos) { - CHKPC(onCallbackInfo); if (!copySensorData(onCallbackInfo, event)) { SEN_HILOGE("Copy sensor data failed"); continue; @@ -140,7 +138,6 @@ static void EmitOnceCallback(SensorEvent *event) return; } for (auto &onceCallbackInfo : iter->second) { - CHKPC(onceCallbackInfo); if (!copySensorData(onceCallbackInfo, event)) { SEN_HILOGE("Copy sensor data failed"); continue; @@ -280,7 +277,6 @@ static bool IsSubscribed(napi_env env, int32_t sensorTypeId, napi_value callback continue; } napi_value sensorCallback = nullptr; - CHKPC(callbackInfo->callback[0]); CHKNRF(env, napi_get_reference_value(env, callbackInfo->callback[0], &sensorCallback), "napi_get_reference_value"); if (IsSameValue(env, callback, sensorCallback)) { @@ -369,7 +365,6 @@ static int32_t RemoveCallback(napi_env env, int32_t sensorTypeId, napi_value cal for (auto iter = callbackInfos.begin(); iter != callbackInfos.end(); ++iter) { CHKPC(*iter); napi_value sensorCallback = nullptr; - CHKPC((*iter)->callback[0]); if (napi_get_reference_value(env, (*iter)->callback[0], &sensorCallback) != napi_ok) { SEN_HILOGE("napi_get_reference_value fail"); continue; diff --git a/services/sensor/src/sensor_dump.cpp b/services/sensor/src/sensor_dump.cpp index 63fa8276..89efec62 100644 --- a/services/sensor/src/sensor_dump.cpp +++ b/services/sensor/src/sensor_dump.cpp @@ -194,7 +194,7 @@ bool SensorDump::DumpSensorList(int32_t fd, const std::vector &sensors) dprintf(fd, "Total sensor:%d, Sensor list:\n", int32_t { sensors.size() }); for (const auto &sensor : sensors) { auto sensorId = sensor.GetSensorId(); - if (sensorMap_.find(SensorId) == sensorMap_.end()) { + if (sensorMap_.find(sensorId) == sensorMap_.end()) { continue; } dprintf(fd, @@ -215,7 +215,7 @@ bool SensorDump::DumpSensorChannel(int32_t fd, ClientInfo &clientInfo) clientInfo.GetSensorChannelInfo(channelInfo); for (const auto &channel : channelInfo) { auto sensorId = channel.GetSensorId(); - if (sensorMap_.find(SensorId) == sensorMap_.end()) { + if (sensorMap_.find(sensorId) == sensorMap_.end()) { continue; } dprintf(fd, @@ -233,7 +233,7 @@ bool SensorDump::DumpOpeningSensor(int32_t fd, const std::vector &sensor dprintf(fd, "Opening sensors:\n"); for (const auto &sensor : sensors) { uint32_t sensorId = sensor.GetSensorId(); - if (sensorMap_.find(SensorId) == sensorMap_.end()) { + if (sensorMap_.find(sensorId) == sensorMap_.end()) { continue; } if (clientInfo.GetSensorState(sensorId)) { @@ -251,7 +251,7 @@ bool SensorDump::DumpSensorData(int32_t fd, ClientInfo &clientInfo) int32_t j = 0; for (auto &sensorData : dataMap) { uint32_t sensorId = sensorData.first; - if (sensorMap_.find(SensorId) == sensorMap_.end()) { + if (sensorMap_.find(sensorId) == sensorMap_.end()) { continue; } dprintf(fd, "sensorId: %8u | sensorType: %s:\n", sensorId, sensorMap_[sensorId].c_str()); -- Gitee