From 567b6186041c3d12bee0e3b8188641a6930b353b Mon Sep 17 00:00:00 2001 From: cff-gite Date: Fri, 24 Jun 2022 14:39:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?sensor=E4=BA=8B=E4=BB=B6=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- .../sensor/src/sensor_service_client.cpp | 2 +- .../native/sensor/src/sensor_service_proxy.cpp | 14 +++++++------- hisysevent.yaml | 2 +- .../adapter/src/hdi_connection.cpp | 18 +++++++++--------- services/sensor/src/sensor_service.cpp | 4 ++-- services/sensor/src/sensor_service_stub.cpp | 8 ++++---- utils/src/sensor_basic_data_channel.cpp | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/frameworks/native/sensor/src/sensor_service_client.cpp b/frameworks/native/sensor/src/sensor_service_client.cpp index f0902268..b25ff538 100755 --- a/frameworks/native/sensor/src/sensor_service_client.cpp +++ b/frameworks/native/sensor/src/sensor_service_client.cpp @@ -67,7 +67,7 @@ int32_t SensorServiceClient::InitServiceClient() std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); retry++; } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "InitServiceClient", "ERROR_CODE", SENSOR_NATIVE_GET_SERVICE_ERR); SEN_HILOGE("get service failed"); return SENSOR_NATIVE_GET_SERVICE_ERR; diff --git a/frameworks/native/sensor/src/sensor_service_proxy.cpp b/frameworks/native/sensor/src/sensor_service_proxy.cpp index 48167e3d..ec4a46f4 100755 --- a/frameworks/native/sensor/src/sensor_service_proxy.cpp +++ b/frameworks/native/sensor/src/sensor_service_proxy.cpp @@ -64,7 +64,7 @@ ErrCode SensorServiceProxy::EnableSensor(uint32_t sensorId, int64_t samplingPeri CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::ENABLE_SENSOR, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "EnaleSensor", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -88,7 +88,7 @@ ErrCode SensorServiceProxy::DisableSensor(uint32_t sensorId) CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::DISABLE_SENSOR, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DisableSensor", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -112,7 +112,7 @@ int32_t SensorServiceProxy::GetSensorState(uint32_t sensorId) CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::GET_SENSOR_STATE, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "GetSensorState", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -148,7 +148,7 @@ ErrCode SensorServiceProxy::RunCommand(uint32_t sensorId, uint32_t cmdType, uint CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::RUN_COMMAND, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "RunCommand", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -172,7 +172,7 @@ std::vector SensorServiceProxy::GetSensorList() } int32_t ret = remote->SendRequest(ISensorService::GET_SENSOR_LIST, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "GetSensorList", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); return sensors; @@ -215,7 +215,7 @@ ErrCode SensorServiceProxy::TransferDataChannel(const sptrSendRequest(ISensorService::TRANSFER_DATA_CHANNEL, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "TransferDataChannel", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -241,7 +241,7 @@ ErrCode SensorServiceProxy::DestroySensorChannel(sptr sensorClien CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::DESTROY_SENSOR_CHANNEL, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DestroySensorChannel", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } diff --git a/hisysevent.yaml b/hisysevent.yaml index d8ba6503..fce6515b 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -domain: SENSORS +domain: SENSOR ENABLE_SENSOR: __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: enable sensor} diff --git a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp b/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp index bebc3832..b8ef612c 100644 --- a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp +++ b/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp @@ -59,7 +59,7 @@ int32_t HdiConnection::ConnectHdi() SEN_HILOGW("connect hdi service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "ConnectHdi", "ERROR_CODE", CONNECT_SENSOR_HDF_ERR); SEN_HILOGE("connect v1_0 hdi failed"); return ERR_NO_INIT; @@ -72,7 +72,7 @@ int32_t HdiConnection::GetSensorList(std::vector& sensorList) std::vector sensorInfos; int32_t ret = sensorInterface_->GetAllSensorInfo(sensorInfos); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "GetSensorList", "ERROR_CODE", ret); SEN_HILOGE("get sensor list failed"); return ret; @@ -98,7 +98,7 @@ int32_t HdiConnection::EnableSensor(int32_t sensorId) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Enable(sensorId); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "EnableSensor", "ERROR_CODE", ret); SEN_HILOGE("connect v1_0 hdi failed"); return ret; @@ -112,7 +112,7 @@ int32_t HdiConnection::DisableSensor(int32_t sensorId) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Disable(sensorId); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DisableSensor", "ERROR_CODE", ret); SEN_HILOGE("Disable is failed"); return ret; @@ -126,7 +126,7 @@ int32_t HdiConnection::SetBatch(int32_t sensorId, int64_t samplingInterval, int6 CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->SetBatch(sensorId, samplingInterval, reportInterval); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SetBatch", "ERROR_CODE", ret); SEN_HILOGE("SetBatch is failed"); return ret; @@ -141,7 +141,7 @@ int32_t HdiConnection::SetMode(int32_t sensorId, int32_t mode) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->SetMode(sensorId, mode); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SetMode", "ERROR_CODE", ret); SEN_HILOGE("SetMode is failed"); return ret; @@ -155,7 +155,7 @@ int32_t HdiConnection::SetOption(int32_t sensorId, int32_t option) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->SetOption(sensorId, option); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SetOption", "ERROR_CODE", ret); SEN_HILOGE("SetOption is failed"); return ret; @@ -170,7 +170,7 @@ int32_t HdiConnection::RegisteDataReport(ZReportDataCb cb, sptrRegister(0, eventCallback_); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "RegisteDataReport", "ERROR_CODE", ret); SEN_HILOGE("Register is failed"); return ret; @@ -186,7 +186,7 @@ int32_t HdiConnection::DestroyHdiConnection() CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Unregister(0, eventCallback_); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DestroyHdiConnection", "ERROR_CODE", ret); SEN_HILOGE("Unregister is failed"); return ret; diff --git a/services/sensor/src/sensor_service.cpp b/services/sensor/src/sensor_service.cpp index 8c1f3985..4c112b25 100644 --- a/services/sensor/src/sensor_service.cpp +++ b/services/sensor/src/sensor_service.cpp @@ -159,10 +159,10 @@ void SensorService::ReportSensorSysEvent(uint32_t sensorId, bool enable, int32_t int32_t uid = clientInfo_.GetUidByPid(pid); std::string message; if (enable) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "ENABLE_SENSOR", HiSysEvent::EventType::STATISTIC, + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "ENABLE_SENSOR", HiSysEvent::EventType::STATISTIC, "LEVEL", logLevel, "UID", uid, "PKG_NAME", packageName, "TYPE", sensorId); } else { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "DISABLE_SENSOR", HiSysEvent::EventType::STATISTIC, + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "DISABLE_SENSOR", HiSysEvent::EventType::STATISTIC, "LEVEL", logLevel, "UID", uid, "PKG_NAME", packageName, "TYPE", sensorId); } } diff --git a/services/sensor/src/sensor_service_stub.cpp b/services/sensor/src/sensor_service_stub.cpp index 08016e89..75bba854 100644 --- a/services/sensor/src/sensor_service_stub.cpp +++ b/services/sensor/src/sensor_service_stub.cpp @@ -81,7 +81,7 @@ ErrCode SensorServiceStub::SensorEnableInner(MessageParcel &data, MessageParcel PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "SensorEnableInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; @@ -96,7 +96,7 @@ ErrCode SensorServiceStub::SensorDisableInner(MessageParcel &data, MessageParcel PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "SensorDisableInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; @@ -111,7 +111,7 @@ ErrCode SensorServiceStub::GetSensorStateInner(MessageParcel &data, MessageParce PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "GetSensorStateInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; @@ -126,7 +126,7 @@ ErrCode SensorServiceStub::RunCommandInner(MessageParcel &data, MessageParcel &r PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "RunCommandInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; diff --git a/utils/src/sensor_basic_data_channel.cpp b/utils/src/sensor_basic_data_channel.cpp index 6a16a30a..3322a137 100755 --- a/utils/src/sensor_basic_data_channel.cpp +++ b/utils/src/sensor_basic_data_channel.cpp @@ -47,7 +47,7 @@ int32_t SensorBasicDataChannel::CreateSensorBasicChannel() int32_t socketPair[SOCKET_PAIR_SIZE] = { 0 }; if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, socketPair) != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_DATA_CHANNEL_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "CreateSensorBasicChannel", "ERROR_CODE", errno); SEN_HILOGE("create socketpair failed"); sendFd_ = -1; @@ -157,7 +157,7 @@ int32_t SensorBasicDataChannel::SendData(const void *vaddr, size_t size) length = send(sendFd_, vaddr, size, MSG_DONTWAIT | MSG_NOSIGNAL); } while (errno == EINTR); if (length < 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, "SENSOR_DATA_CHANNEL_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SendData", "ERROR_CODE", errno); SEN_HILOGE("send fail : %{public}d, length = %{public}d", errno, (int32_t)length); return SENSOR_CHANNEL_SEND_DATA_ERR; -- Gitee From ebb4fecddf31db0dbb7582e87da1ba157fddd08d Mon Sep 17 00:00:00 2001 From: cff-gite Date: Fri, 24 Jun 2022 17:36:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sensor=E4=BA=8B=E4=BB=B6=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- .../sensor/src/sensor_service_client.cpp | 2 +- .../native/sensor/src/sensor_service_proxy.cpp | 14 +++++++------- .../adapter/src/hdi_connection.cpp | 18 +++++++++--------- services/sensor/src/sensor_service.cpp | 4 ++-- services/sensor/src/sensor_service_stub.cpp | 8 ++++---- utils/src/sensor_basic_data_channel.cpp | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/frameworks/native/sensor/src/sensor_service_client.cpp b/frameworks/native/sensor/src/sensor_service_client.cpp index b25ff538..c6298e47 100755 --- a/frameworks/native/sensor/src/sensor_service_client.cpp +++ b/frameworks/native/sensor/src/sensor_service_client.cpp @@ -67,7 +67,7 @@ int32_t SensorServiceClient::InitServiceClient() std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); retry++; } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "InitServiceClient", "ERROR_CODE", SENSOR_NATIVE_GET_SERVICE_ERR); SEN_HILOGE("get service failed"); return SENSOR_NATIVE_GET_SERVICE_ERR; diff --git a/frameworks/native/sensor/src/sensor_service_proxy.cpp b/frameworks/native/sensor/src/sensor_service_proxy.cpp index ec4a46f4..a0a17892 100755 --- a/frameworks/native/sensor/src/sensor_service_proxy.cpp +++ b/frameworks/native/sensor/src/sensor_service_proxy.cpp @@ -64,7 +64,7 @@ ErrCode SensorServiceProxy::EnableSensor(uint32_t sensorId, int64_t samplingPeri CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::ENABLE_SENSOR, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "EnaleSensor", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -88,7 +88,7 @@ ErrCode SensorServiceProxy::DisableSensor(uint32_t sensorId) CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::DISABLE_SENSOR, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DisableSensor", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -112,7 +112,7 @@ int32_t SensorServiceProxy::GetSensorState(uint32_t sensorId) CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::GET_SENSOR_STATE, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "GetSensorState", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -148,7 +148,7 @@ ErrCode SensorServiceProxy::RunCommand(uint32_t sensorId, uint32_t cmdType, uint CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::RUN_COMMAND, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "RunCommand", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -172,7 +172,7 @@ std::vector SensorServiceProxy::GetSensorList() } int32_t ret = remote->SendRequest(ISensorService::GET_SENSOR_LIST, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "GetSensorList", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); return sensors; @@ -215,7 +215,7 @@ ErrCode SensorServiceProxy::TransferDataChannel(const sptrSendRequest(ISensorService::TRANSFER_DATA_CHANNEL, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "TransferDataChannel", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } @@ -241,7 +241,7 @@ ErrCode SensorServiceProxy::DestroySensorChannel(sptr sensorClien CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(ISensorService::DESTROY_SENSOR_CHANNEL, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DestroySensorChannel", "ERROR_CODE", ret); SEN_HILOGE("failed, ret : %{public}d", ret); } diff --git a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp b/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp index b8ef612c..0f8b8487 100644 --- a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp +++ b/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp @@ -59,7 +59,7 @@ int32_t HdiConnection::ConnectHdi() SEN_HILOGW("connect hdi service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "ConnectHdi", "ERROR_CODE", CONNECT_SENSOR_HDF_ERR); SEN_HILOGE("connect v1_0 hdi failed"); return ERR_NO_INIT; @@ -72,7 +72,7 @@ int32_t HdiConnection::GetSensorList(std::vector& sensorList) std::vector sensorInfos; int32_t ret = sensorInterface_->GetAllSensorInfo(sensorInfos); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "GetSensorList", "ERROR_CODE", ret); SEN_HILOGE("get sensor list failed"); return ret; @@ -98,7 +98,7 @@ int32_t HdiConnection::EnableSensor(int32_t sensorId) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Enable(sensorId); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "EnableSensor", "ERROR_CODE", ret); SEN_HILOGE("connect v1_0 hdi failed"); return ret; @@ -112,7 +112,7 @@ int32_t HdiConnection::DisableSensor(int32_t sensorId) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Disable(sensorId); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DisableSensor", "ERROR_CODE", ret); SEN_HILOGE("Disable is failed"); return ret; @@ -126,7 +126,7 @@ int32_t HdiConnection::SetBatch(int32_t sensorId, int64_t samplingInterval, int6 CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->SetBatch(sensorId, samplingInterval, reportInterval); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SetBatch", "ERROR_CODE", ret); SEN_HILOGE("SetBatch is failed"); return ret; @@ -141,7 +141,7 @@ int32_t HdiConnection::SetMode(int32_t sensorId, int32_t mode) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->SetMode(sensorId, mode); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SetMode", "ERROR_CODE", ret); SEN_HILOGE("SetMode is failed"); return ret; @@ -155,7 +155,7 @@ int32_t HdiConnection::SetOption(int32_t sensorId, int32_t option) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->SetOption(sensorId, option); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SetOption", "ERROR_CODE", ret); SEN_HILOGE("SetOption is failed"); return ret; @@ -170,7 +170,7 @@ int32_t HdiConnection::RegisteDataReport(ZReportDataCb cb, sptrRegister(0, eventCallback_); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "RegisteDataReport", "ERROR_CODE", ret); SEN_HILOGE("Register is failed"); return ret; @@ -186,7 +186,7 @@ int32_t HdiConnection::DestroyHdiConnection() CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Unregister(0, eventCallback_); if (ret != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "DestroyHdiConnection", "ERROR_CODE", ret); SEN_HILOGE("Unregister is failed"); return ret; diff --git a/services/sensor/src/sensor_service.cpp b/services/sensor/src/sensor_service.cpp index 4c112b25..d668b21e 100644 --- a/services/sensor/src/sensor_service.cpp +++ b/services/sensor/src/sensor_service.cpp @@ -159,10 +159,10 @@ void SensorService::ReportSensorSysEvent(uint32_t sensorId, bool enable, int32_t int32_t uid = clientInfo_.GetUidByPid(pid); std::string message; if (enable) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "ENABLE_SENSOR", HiSysEvent::EventType::STATISTIC, + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "ENABLE_SENSOR", HiSysEvent::EventType::STATISTIC, "LEVEL", logLevel, "UID", uid, "PKG_NAME", packageName, "TYPE", sensorId); } else { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "DISABLE_SENSOR", HiSysEvent::EventType::STATISTIC, + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "DISABLE_SENSOR", HiSysEvent::EventType::STATISTIC, "LEVEL", logLevel, "UID", uid, "PKG_NAME", packageName, "TYPE", sensorId); } } diff --git a/services/sensor/src/sensor_service_stub.cpp b/services/sensor/src/sensor_service_stub.cpp index 75bba854..8185c850 100644 --- a/services/sensor/src/sensor_service_stub.cpp +++ b/services/sensor/src/sensor_service_stub.cpp @@ -81,7 +81,7 @@ ErrCode SensorServiceStub::SensorEnableInner(MessageParcel &data, MessageParcel PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "SensorEnableInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; @@ -96,7 +96,7 @@ ErrCode SensorServiceStub::SensorDisableInner(MessageParcel &data, MessageParcel PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "SensorDisableInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; @@ -111,7 +111,7 @@ ErrCode SensorServiceStub::GetSensorStateInner(MessageParcel &data, MessageParce PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "GetSensorStateInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; @@ -126,7 +126,7 @@ ErrCode SensorServiceStub::RunCommandInner(MessageParcel &data, MessageParcel &r PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(this->GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "RunCommandInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return ERR_PERMISSION_DENIED; diff --git a/utils/src/sensor_basic_data_channel.cpp b/utils/src/sensor_basic_data_channel.cpp index 3322a137..25829ba1 100755 --- a/utils/src/sensor_basic_data_channel.cpp +++ b/utils/src/sensor_basic_data_channel.cpp @@ -47,7 +47,7 @@ int32_t SensorBasicDataChannel::CreateSensorBasicChannel() int32_t socketPair[SOCKET_PAIR_SIZE] = { 0 }; if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, socketPair) != 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "CreateSensorBasicChannel", "ERROR_CODE", errno); SEN_HILOGE("create socketpair failed"); sendFd_ = -1; @@ -157,7 +157,7 @@ int32_t SensorBasicDataChannel::SendData(const void *vaddr, size_t size) length = send(sendFd_, vaddr, size, MSG_DONTWAIT | MSG_NOSIGNAL); } while (errno == EINTR); if (length < 0) { - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS_SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", HiSysEvent::EventType::FAULT, "FUNC_NAME", "SendData", "ERROR_CODE", errno); SEN_HILOGE("send fail : %{public}d, length = %{public}d", errno, (int32_t)length); return SENSOR_CHANNEL_SEND_DATA_ERR; -- Gitee From 19f8ec2e185e31aeeaeef58d54f0de72d7bdfa10 Mon Sep 17 00:00:00 2001 From: cff-gite Date: Sat, 25 Jun 2022 15:12:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?sensor=E4=BA=8B=E4=BB=B6=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- bundle.json | 4 ++-- services/sensor/src/sensor_data_processer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 002f926b..95a522ac 100644 --- a/bundle.json +++ b/bundle.json @@ -15,8 +15,8 @@ "rom": "2048KB", "ram": "~4096KB", "hisysevent_config": [ - "//base/sensors/sensor/hisysevent.yaml" - ], + "//base/sensors/sensor/hisysevent.yaml" + ], "deps": { "components": [ "access_token", diff --git a/services/sensor/src/sensor_data_processer.cpp b/services/sensor/src/sensor_data_processer.cpp index 606be535..be50d8c7 100644 --- a/services/sensor/src/sensor_data_processer.cpp +++ b/services/sensor/src/sensor_data_processer.cpp @@ -213,7 +213,7 @@ bool SensorDataProcesser::CheckSendDataPermission(sptr c PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(appThreadInfo.callerToken, sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::SENSORS, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEvent::Write(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "FUNC_NAME", "CheckSendDataPermission", "ERROR_CODE", ret); SEN_HILOGE("sensorId: %{public}u grant failed, result: %{public}d", sensorId, ret); return false; -- Gitee