diff --git a/frameworks/native/sensor/src/sensor_service_client.cpp b/frameworks/native/sensor/src/sensor_service_client.cpp index 8effd56ea010d8ba32fdeb7fea45d464522a2044..3b7e30c715eb0684f1cb11b6aeea05b6f0ba4196 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++; } - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_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 3a6cb1eaeb24f3eb769aa24618c090effdf2d150..b04d242951bb31237f52041a344d08ace354fe23 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) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "EnableSensor", "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) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "DisableSensor", "ERROR_CODE", ret); SEN_HILOGE("failed, ret:%{public}d", ret); } @@ -112,7 +112,7 @@ std::vector SensorServiceProxy::GetSensorList() } int32_t ret = remote->SendRequest(ISensorService::GET_SENSOR_LIST, data, reply, option); if (ret != NO_ERROR) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "GetSensorList", "ERROR_CODE", ret); SEN_HILOGE("failed, ret:%{public}d", ret); return sensors; @@ -158,7 +158,7 @@ ErrCode SensorServiceProxy::TransferDataChannel(const sptrSendRequest(ISensorService::TRANSFER_DATA_CHANNEL, data, reply, option); if (ret != NO_ERROR) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "TransferDataChannel", "ERROR_CODE", ret); SEN_HILOGE("failed, ret:%{public}d", ret); } @@ -184,7 +184,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) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "DestroySensorChannel", "ERROR_CODE", ret); SEN_HILOGE("failed, ret:%{public}d", ret); } diff --git a/hisysevent.yaml b/hisysevent.yaml old mode 100644 new mode 100755 index dba9b2a62a7236486012d7cd51948a01f0fed728..dacb428af770e7e4391327f5be0fed5f072da9bd --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -14,38 +14,38 @@ domain: SENSOR ENABLE_SENSOR: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: enable sensor} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: When registering enable sensor} UID: {type: INT32, desc: calling uid} PKG_NAME: {type: STRING, desc: package name} TYPE: {type: INT32, desc: type} DISABLE_SENSOR: - __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: disable sensor} + __BASE: {type: STATISTIC, level: MINOR, tag: PowerStats, desc: When unregistering disable sensor} UID: {type: INT32, desc: calling uid} PKG_NAME: {type: STRING, desc: package name} TYPE: {type: INT32, desc: type} -SENSOR_DATA_CHANNEL_EXCEPTION: +DATA_CHANNEL_EXCEPTION: __BASE: {type: FAULT, level: MINOR, desc: sensor data channel exception} PKG_NAME: {type: STRING, desc: package name} ERROR_CODE: {type: INT32, desc: error code} -SENSOR_VERIFY_ACCESS_TOKEN_FAIL: +VERIFY_ACCESS_TOKEN_FAIL: __BASE: {type: SECURITY, level: MINOR, desc: sensor verify access token fail} PKG_NAME: {type: STRING, desc: package name} ERROR_CODE: {type: INT32, desc: error code} -SENSOR_SERVICE_IPC_EXCEPTION: +SERVICE_IPC_EXCEPTION: __BASE: {type: FAULT, level: MINOR, desc: sensor service ipc exception} PKG_NAME: {type: STRING, desc: package name} ERROR_CODE: {type: INT32, desc: error code} -SENSOR_HDF_SERVICE_EXCEPTION: +HDF_SERVICE_EXCEPTION: __BASE: {type: FAULT, level: MINOR, desc: sensor hdf service exception} PKG_NAME: {type: STRING, desc: package name} ERROR_CODE: {type: INT32, desc: error code} -SENSOR_SERVICE_EXCEPTION: +SERVICE_EXCEPTION: __BASE: {type: FAULT, level: MINOR, desc: sensor service exception} PKG_NAME: {type: STRING, desc: package name} ERROR_CODE: {type: INT32, desc: error code} \ No newline at end of file diff --git a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp b/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp old mode 100644 new mode 100755 index 7c55d9567ecda10b8647ed598cba41ef1f67ff0a..fb225c7ebfa04c8825e3fe260d72502984317e32 --- a/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp +++ b/services/sensor/hdi_connection/adapter/src/hdi_connection.cpp @@ -60,7 +60,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)); } - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "ConnectHdi", "ERROR_CODE", CONNECT_SENSOR_HDF_ERR); SEN_HILOGE("connect v1_0 hdi failed"); return ERR_NO_INIT; @@ -73,7 +73,7 @@ int32_t HdiConnection::GetSensorList(std::vector& sensorList) std::vector sensorInfos; int32_t ret = sensorInterface_->GetAllSensorInfo(sensorInfos); if (ret != 0) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "GetSensorList", "ERROR_CODE", ret); SEN_HILOGE("get sensor list failed"); return ret; @@ -101,7 +101,7 @@ int32_t HdiConnection::EnableSensor(int32_t sensorId) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Enable(sensorId); if (ret != 0) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "EnableSensor", "ERROR_CODE", ret); SEN_HILOGE("connect v1_0 hdi failed"); return ret; @@ -115,7 +115,7 @@ int32_t HdiConnection::DisableSensor(int32_t sensorId) CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Disable(sensorId); if (ret != 0) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "DisableSensor", "ERROR_CODE", ret); SEN_HILOGE("Disable is failed"); return ret; @@ -129,7 +129,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) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "SetBatch", "ERROR_CODE", ret); SEN_HILOGE("SetBatch is failed"); return ret; @@ -144,7 +144,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) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "SetMode", "ERROR_CODE", ret); SEN_HILOGE("SetMode is failed"); return ret; @@ -159,7 +159,7 @@ int32_t HdiConnection::RegisteDataReport(ReportDataCb cb, sptrRegister(0, eventCallback_); if (ret != 0) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "RegisteDataReport", "ERROR_CODE", ret); SEN_HILOGE("Register is failed"); return ret; @@ -175,7 +175,7 @@ int32_t HdiConnection::DestroyHdiConnection() CHKPR(sensorInterface_, ERR_NO_INIT); int32_t ret = sensorInterface_->Unregister(0, eventCallback_); if (ret != 0) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "DestroyHdiConnection", "ERROR_CODE", ret); SEN_HILOGE("Unregister is failed"); return ret; diff --git a/services/sensor/src/sensor_service_stub.cpp b/services/sensor/src/sensor_service_stub.cpp old mode 100644 new mode 100755 index 4696378b46e849387fe48f8dfdfada40d3549b63..d6494112aea0fc3e4a155db6c41644546ffd7776 --- a/services/sensor/src/sensor_service_stub.cpp +++ b/services/sensor/src/sensor_service_stub.cpp @@ -83,7 +83,7 @@ ErrCode SensorServiceStub::SensorEnableInner(MessageParcel &data, MessageParcel PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "PKG_NAME", "SensorEnableInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId:%{public}u grant failed,result:%{public}d", sensorId, ret); return PERMISSION_DENIED; @@ -108,7 +108,7 @@ ErrCode SensorServiceStub::SensorDisableInner(MessageParcel &data, MessageParcel PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckSensorPermission(GetCallingTokenID(), sensorId); if (ret != PERMISSION_GRANTED) { - HiSysEventWrite(HiSysEvent::Domain::SENSOR, "SENSOR_VERIFY_ACCESS_TOKEN_FAIL", + HiSysEventWrite(HiSysEvent::Domain::SENSOR, "VERIFY_ACCESS_TOKEN_FAIL", HiSysEvent::EventType::SECURITY, "PKG_NAME", "SensorDisableInner", "ERROR_CODE", ret); SEN_HILOGE("sensorId:%{public}u grant failed,result:%{public}d", sensorId, ret); return PERMISSION_DENIED; diff --git a/utils/src/sensor_basic_data_channel.cpp b/utils/src/sensor_basic_data_channel.cpp index 44b9a337b4f738ff1d737f8630644995417bca6f..308ad1487652ea34b4f168c5de473691974fd457 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) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "DATA_CHANNEL_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "CreateSensorBasicChannel", "ERROR_CODE", errno); SEN_HILOGE("create socketpair failed"); sendFd_ = -1; @@ -155,7 +155,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) { - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "SENSOR_DATA_CHANNEL_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SENSOR, "DATA_CHANNEL_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "SendData", "ERROR_CODE", errno); SEN_HILOGE("send fail:%{public}d,length:%{public}d", errno, (int32_t)length); return SENSOR_CHANNEL_SEND_DATA_ERR;