From 2cc4a461a505b259acc102be2ad1da63ba95b4e9 Mon Sep 17 00:00:00 2001 From: cff-gite Date: Wed, 30 Mar 2022 18:01:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9vibrator=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- .../miscdevice/src/light_service_client.cpp | 30 ++--- .../src/miscdevice_service_proxy.cpp | 120 +++++++++--------- .../src/vibrator_service_client.cpp | 49 ++++--- .../native/vibrator/src/vibrator_agent.cpp | 16 +-- .../plugin/vibrator/src/vibrator_js.cpp | 2 +- .../vibrator/src/vibrator_napi_utils.cpp | 6 +- .../src/miscdevice_service.cpp | 64 +++++----- .../src/miscdevice_service_stub.cpp | 22 ++-- utils/src/dmd_report.cpp | 8 +- utils/src/miscdevice_common.cpp | 8 +- utils/src/miscdevice_log.h | 53 ++++++++ utils/src/permission_util.cpp | 4 +- 12 files changed, 217 insertions(+), 165 deletions(-) create mode 100644 utils/src/miscdevice_log.h diff --git a/frameworks/native/miscdevice/src/light_service_client.cpp b/frameworks/native/miscdevice/src/light_service_client.cpp index 4d5072d..0ec1e49 100644 --- a/frameworks/native/miscdevice/src/light_service_client.cpp +++ b/frameworks/native/miscdevice/src/light_service_client.cpp @@ -38,7 +38,7 @@ int32_t LightServiceClient::InitServiceClient() CALL_LOG_ENTER; std::lock_guard clientLock(clientMutex_); if (miscdeviceProxy_ != nullptr) { - HiLog::Debug(LABEL, "%{public}s already init", __func__); + MISC_HILOGD("miscdeviceProxy_ already init"); return ERR_OK; } auto sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); @@ -47,7 +47,7 @@ int32_t LightServiceClient::InitServiceClient() while (retry < GET_SERVICE_MAX_COUNT) { miscdeviceProxy_ = iface_cast(sm->GetSystemAbility(MISCDEVICE_SERVICE_ABILITY_ID)); if (miscdeviceProxy_ != nullptr) { - HiLog::Debug(LABEL, "%{public}s get service success, retry : %{public}d", __func__, retry); + MISC_HILOGD("miscdeviceProxy_ get service success, retry : %{public}d", retry); serviceDeathObserver_ = new (std::nothrow) DeathRecipientTemplate(*const_cast(this)); if (serviceDeathObserver_ != nullptr) { miscdeviceProxy_->AsObject()->AddDeathRecipient(serviceDeathObserver_); @@ -59,16 +59,16 @@ int32_t LightServiceClient::InitServiceClient() retry++; } DmdReport::ReportException(MISC_SERVICE_EXCEPTION, "InitServiceClient", MISC_NATIVE_GET_SERVICE_ERR); - HiLog::Error(LABEL, "%{public}s get service failed", __func__); + MISC_HILOGE("get service failed"); return MISC_NATIVE_GET_SERVICE_ERR; } std::vector LightServiceClient::GetLightIdList() { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("getLightIdList begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return {}; } return miscdeviceProxy_->GetLightSupportId(); @@ -76,10 +76,10 @@ std::vector LightServiceClient::GetLightIdList() bool LightServiceClient::IsLightEffectSupport(int32_t lightId, const std::string &effectId) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("light effect support begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return false; } return miscdeviceProxy_->IsLightEffectSupport(lightId, effectId); @@ -87,10 +87,10 @@ bool LightServiceClient::IsLightEffectSupport(int32_t lightId, const std::string int32_t LightServiceClient::Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("Light begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->Light(lightId, brightness, timeOn, timeOff); @@ -98,10 +98,10 @@ int32_t LightServiceClient::Light(int32_t lightId, uint64_t brightness, uint32_t int32_t LightServiceClient::PlayLightEffect(int32_t lightId, const std::string &type) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("playLightEffect begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->PlayLightEffect(lightId, type); @@ -109,10 +109,10 @@ int32_t LightServiceClient::PlayLightEffect(int32_t lightId, const std::string & int32_t LightServiceClient::StopLightEffect(int32_t lightId) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("stopLightEffect begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->StopLightEffect(lightId); @@ -120,12 +120,12 @@ int32_t LightServiceClient::StopLightEffect(int32_t lightId) void LightServiceClient::ProcessDeathObserver(const wptr &object) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("processDeathObserver begin"); (void)object; miscdeviceProxy_ = nullptr; auto ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return; } } diff --git a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp index 64eb3c6..bdf2275 100644 --- a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp +++ b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp @@ -36,17 +36,17 @@ bool MiscdeviceServiceProxy::IsAbilityAvailable(MiscdeviceDeviceId groupID) MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return false; } if (!data.WriteUint32(static_cast(groupID))) { - HiLog::Error(LABEL, "%{public}s write groupID failed", __func__); + MISC_HILOGE("write groupID failed"); return false; } int32_t ret = Remote()->SendRequest(IS_ABILITY_AVAILABLE, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "IsAbilityAvailable", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); return false; } return reply.ReadBool(); @@ -58,21 +58,21 @@ bool MiscdeviceServiceProxy::IsVibratorEffectAvailable(int32_t vibratorId, const MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return false; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 failed", __func__); + MISC_HILOGE("WriteInt32 failed"); return false; } if (!data.WriteString(effectType)) { - HiLog::Error(LABEL, "%{public}s WriteString failed", __func__); + MISC_HILOGE("WriteString failed"); return false; } int32_t ret = Remote()->SendRequest(IS_VIBRATOR_EFFECT_AVAILABLE, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "IsVibratorEffectAvailable", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("SendRequest failed, ret : %{public}d", ret); return false; } return reply.ReadBool(); @@ -85,18 +85,18 @@ std::vector MiscdeviceServiceProxy::GetVibratorIdList() MessageOption option; std::vector idVec; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return idVec; } int32_t ret = Remote()->SendRequest(GET_VIBRATOR_ID_LIST, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "GetVibratorIdList", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("SendRequest failed, ret : %{public}d", ret); return idVec; } uint32_t setCount = reply.ReadUint32(); if (setCount <= 0 || setCount > idVec.max_size()) { - HiLog::Error(LABEL, "%{public}s setCount: %{public}d is invalid", __func__, setCount); + MISC_HILOGE("setCount: %{public}d is invalid", setCount); return idVec; } idVec.resize(setCount); @@ -110,21 +110,21 @@ int32_t MiscdeviceServiceProxy::Vibrate(int32_t vibratorId, uint32_t timeOut) MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 vibratorId failed", __func__); + MISC_HILOGE("WriteInt32 vibratorId failed"); return WRITE_MSG_ERR; } if (!data.WriteUint32(timeOut)) { - HiLog::Error(LABEL, "%{public}s WriteUint32 timeOut failed", __func__); + MISC_HILOGE("WriteUint32 timeOut failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(VIBRATE, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "Vibrate", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest ret : %{public}d", ret); } return ret; } @@ -135,17 +135,17 @@ int32_t MiscdeviceServiceProxy::CancelVibrator(int32_t vibratorId) MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 failed", __func__); + MISC_HILOGE("WriteInt32 failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(CANCEL_VIBRATOR, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "CancelVibrator", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("ret : %{public}d", ret); } return ret; } @@ -156,25 +156,25 @@ int32_t MiscdeviceServiceProxy::PlayVibratorEffect(int32_t vibratorId, const std MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 vibratorId failed", __func__); + MISC_HILOGE("WriteInt32 vibratorId failed"); return WRITE_MSG_ERR; } if (!data.WriteString(effect)) { - HiLog::Error(LABEL, "%{public}s WriteString effect failed", __func__); + MISC_HILOGE("WriteString effect failed"); return WRITE_MSG_ERR; } if (!data.WriteBool(isLooping)) { - HiLog::Error(LABEL, "%{public}s WriteBool effect failed", __func__); + MISC_HILOGE("WriteBool effect failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(PLAY_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "PlayVibratorEffect", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("ret : %{public}d", ret); } return ret; } @@ -186,29 +186,29 @@ int32_t MiscdeviceServiceProxy::PlayCustomVibratorEffect(int32_t vibratorId, con MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 vibratorId failed", __func__); + MISC_HILOGE("WriteInt32 vibratorId failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32Vector(timing)) { - HiLog::Error(LABEL, "%{public}s WriteInt32Vector timing failed", __func__); + MISC_HILOGE("WriteInt32Vector timing failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32Vector(intensity)) { - HiLog::Error(LABEL, "%{public}s WriteInt32Vector intensity failed", __func__); + MISC_HILOGE("WriteInt32Vector intensity failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(periodCount)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 periodCount failed", __func__); + MISC_HILOGE("WriteInt32 periodCount failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(PLAY_CUSTOM_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "PlayCustomVibratorEffect", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("ret : %{public}d", ret); } return ret; } @@ -219,21 +219,21 @@ int32_t MiscdeviceServiceProxy::StopVibratorEffect(int32_t vibratorId, const std MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 vibratorId failed", __func__); + MISC_HILOGE("WriteInt32 vibratorId failed"); return WRITE_MSG_ERR; } if (!data.WriteString(effect)) { - HiLog::Error(LABEL, "%{public}s WriteString effect failed", __func__); + MISC_HILOGE("WriteString effect failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(STOP_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "StopVibratorEffect", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("ret : %{public}d", ret); } return ret; } @@ -244,21 +244,21 @@ int32_t MiscdeviceServiceProxy::SetVibratorParameter(int32_t vibratorId, const s MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 vibratorId failed", __func__); + MISC_HILOGE("WriteInt32 vibratorId failed"); return WRITE_MSG_ERR; } if (!data.WriteString(cmd)) { - HiLog::Error(LABEL, "%{public}s WriteString cmd failed", __func__); + MISC_HILOGE("WriteString cmd failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(SET_VIBRATOR_PARA, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "SetVibratorParameter", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("ret : %{public}d", ret); } return ret; } @@ -269,21 +269,21 @@ std::string MiscdeviceServiceProxy::GetVibratorParameter(int32_t vibratorId, con MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return ""; } if (!data.WriteInt32(vibratorId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 vibratorId failed", __func__); + MISC_HILOGE("WriteInt32 vibratorId failed"); return ""; } if (!data.WriteString(cmd)) { - HiLog::Error(LABEL, "%{public}s WriteString cmd failed", __func__); + MISC_HILOGE("WriteString cmd failed"); return ""; } int32_t ret = Remote()->SendRequest(GET_VIBRATOR_PARA, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "SetVibratorParameter", ret); - HiLog::Error(LABEL, "%{public}s ret : %{public}d", __func__, ret); + MISC_HILOGE("ret : %{public}d", ret); return ""; } return reply.ReadString(); @@ -296,17 +296,17 @@ std::vector MiscdeviceServiceProxy::GetLightSupportId() MessageOption option; std::vector idVec; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return idVec; } int32_t ret = Remote()->SendRequest(GET_LIGHT_SUPPORT_ID, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "GetLightSupportId", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); } int32_t setCount = reply.ReadInt32(); if (setCount <= 0 || setCount > idVec.max_size()) { - HiLog::Error(LABEL, "%{public}s setCount: %{public}d is invalid", __func__, setCount); + MISC_HILOGE("setCount: %{public}d is invalid", setCount); return idVec; } idVec.resize(setCount); @@ -320,22 +320,22 @@ bool MiscdeviceServiceProxy::IsLightEffectSupport(int32_t lightId, const std::st MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return false; } if (!data.WriteInt32(lightId)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 lightId failed", __func__); + MISC_HILOGE("WriteInt32 lightId failed"); return false; } if (!data.WriteString(effectId)) { - HiLog::Error(LABEL, "%{public}s WriteString effectId failed", __func__); + MISC_HILOGE("WriteString effectId failed"); return false; } int32_t ret = Remote()->SendRequest(IS_LIGHT_EFFECT_SUPPORT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "IsLightEffectSupport", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); return false; } return reply.ReadBool(); @@ -347,30 +347,30 @@ int32_t MiscdeviceServiceProxy::Light(int32_t id, uint64_t brightness, uint32_t MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(id)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 id failed", __func__); + MISC_HILOGE("WriteInt32 id failed"); return WRITE_MSG_ERR; } if (!data.WriteUint64(brightness)) { - HiLog::Error(LABEL, "%{public}s WriteUint64 brightness failed", __func__); + MISC_HILOGE("WriteUint64 brightness failed"); return WRITE_MSG_ERR; } if (!data.WriteUint32(timeOn)) { - HiLog::Error(LABEL, "%{public}s WriteUint32 timeOn failed", __func__); + MISC_HILOGE("WriteUint32 timeOn failed"); return WRITE_MSG_ERR; } if (!data.WriteUint32(timeOff)) { - HiLog::Error(LABEL, "%{public}s WriteUint32 timeOff failed", __func__); + MISC_HILOGE("WriteUint32 timeOff failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(LIGHT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "Light", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); } return ret; } @@ -381,21 +381,21 @@ int32_t MiscdeviceServiceProxy::PlayLightEffect(int32_t id, const std::string &t MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(id)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 id failed", __func__); + MISC_HILOGE("WriteInt32 id failed"); return WRITE_MSG_ERR; } if (!data.WriteString(type)) { - HiLog::Error(LABEL, "%{public}s WriteString type failed", __func__); + MISC_HILOGE("WriteString type failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(PLAY_LIGHT_EFFECT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "PlayLightEffect", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); } return ret; } @@ -406,17 +406,17 @@ int32_t MiscdeviceServiceProxy::StopLightEffect(int32_t id) MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - HiLog::Error(LABEL, "%{public}s write descriptor failed", __func__); + MISC_HILOGE("write descriptor failed"); return WRITE_MSG_ERR; } if (!data.WriteInt32(id)) { - HiLog::Error(LABEL, "%{public}s WriteInt32 id failed", __func__); + MISC_HILOGE("WriteInt32 id failed"); return WRITE_MSG_ERR; } int32_t ret = Remote()->SendRequest(STOP_LIGHT_EFFECT, data, reply, option); if (ret != NO_ERROR) { DmdReport::ReportException(MISC_SERVICE_IPC_EXCEPTION, "StopLightEffect", ret); - HiLog::Error(LABEL, "%{public}s failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); } return ret; } diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index cc36404..e9188b7 100755 --- a/frameworks/native/miscdevice/src/vibrator_service_client.cpp +++ b/frameworks/native/miscdevice/src/vibrator_service_client.cpp @@ -35,22 +35,22 @@ constexpr uint32_t WAIT_MS = 200; int32_t VibratorServiceClient::InitServiceClient() { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("initServiceClient begin"); std::lock_guard clientLock(clientMutex_); if (miscdeviceProxy_ != nullptr) { - HiLog::Warn(LABEL, "%{public}s already init", __func__); + MISC_HILOGW("miscdeviceProxy_ already init"); return ERR_OK; } auto sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - HiLog::Error(LABEL, "%{public}s sm cannot be null", __func__); + MISC_HILOGE("sm cannot be null"); return MISC_NATIVE_SAM_ERR; } int32_t retry = 0; while (retry < GET_SERVICE_MAX_COUNT) { miscdeviceProxy_ = iface_cast(sm->GetSystemAbility(MISCDEVICE_SERVICE_ABILITY_ID)); if (miscdeviceProxy_ != nullptr) { - HiLog::Debug(LABEL, "%{public}s get service success, retry : %{public}d", __func__, retry); + MISC_HILOGD("get service success, retry : %{public}d", retry); serviceDeathObserver_ = new (std::nothrow) DeathRecipientTemplate(*const_cast(this)); if (serviceDeathObserver_ != nullptr) { @@ -58,21 +58,21 @@ int32_t VibratorServiceClient::InitServiceClient() } return ERR_OK; } - HiLog::Warn(LABEL, "%{public}s get service failed, retry : %{public}d", __func__, retry); + MISC_HILOGW("get service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); retry++; } DmdReport::ReportException(MISC_SERVICE_EXCEPTION, "InitServiceClient", MISC_NATIVE_GET_SERVICE_ERR); - HiLog::Error(LABEL, "%{public}s get service failed", __func__); + MISC_HILOGE("get service failed"); return MISC_NATIVE_GET_SERVICE_ERR; } std::vector VibratorServiceClient::GetVibratorIdList() { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("getVibratorIdList begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return {}; } return miscdeviceProxy_->GetVibratorIdList(); @@ -80,10 +80,10 @@ std::vector VibratorServiceClient::GetVibratorIdList() bool VibratorServiceClient::IsVibratorEffectSupport(int32_t vibratorId, const std::string &effect) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("vibratorEffectSupport begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return false; } return miscdeviceProxy_->IsVibratorEffectAvailable(vibratorId, effect); @@ -91,10 +91,10 @@ bool VibratorServiceClient::IsVibratorEffectSupport(int32_t vibratorId, const st int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, uint32_t timeOut) { - HiLog::Debug(LABEL, "%{public}s begin, timeOut : %{public}u", __func__, timeOut); + MISC_HILOGD("Vibrate begin, timeOut : %{public}u", timeOut); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->Vibrate(vibratorId, timeOut); @@ -102,10 +102,10 @@ int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, uint32_t timeOut) int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, const std::string &effect, bool isLooping) { - HiLog::Debug(LABEL, "%{public}s begin, effect : %{public}s", __func__, effect.c_str()); + MISC_HILOGD("Vibrate begin, effect : %{public}s", effect.c_str()); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->PlayVibratorEffect(vibratorId, effect, isLooping); @@ -114,10 +114,10 @@ int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, const std::string &ef int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, std::vector timing, std::vector intensity, int32_t periodCount) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("Vibrate begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->PlayCustomVibratorEffect(vibratorId, timing, intensity, periodCount); @@ -125,11 +125,10 @@ int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, std::vector int32_t VibratorServiceClient::Stop(int32_t vibratorId, const std::string &type) { - HiLog::Debug(LABEL, "%{public}s begin, vibratorId : %{public}d, type : %{public}s", __func__, vibratorId, - type.c_str()); + MISC_HILOGD("Stop begin, vibratorId : %{public}d, type : %{public}s", vibratorId, type.c_str()); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } if (type == "time") { @@ -142,10 +141,10 @@ int32_t VibratorServiceClient::Stop(int32_t vibratorId, const std::string &type) int32_t VibratorServiceClient::SetVibratorParameter(int32_t vibratorId, const std::string &cmd) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("SetVibratorParameter begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return MISC_NATIVE_GET_SERVICE_ERR; } return miscdeviceProxy_->SetVibratorParameter(vibratorId, cmd); @@ -153,10 +152,10 @@ int32_t VibratorServiceClient::SetVibratorParameter(int32_t vibratorId, const st std::string VibratorServiceClient::GetVibratorParameter(int32_t vibratorId, const std::string &command) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("GetVibratorParameter begin"); int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return {}; } return miscdeviceProxy_->GetVibratorParameter(vibratorId, command); @@ -164,12 +163,12 @@ std::string VibratorServiceClient::GetVibratorParameter(int32_t vibratorId, cons void VibratorServiceClient::ProcessDeathObserver(const wptr &object) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("ProcessDeathObserver begin"); (void)object; miscdeviceProxy_ = nullptr; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); + MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); return; } } diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index bc1c545..c2aec0f 100644 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -38,15 +38,15 @@ int32_t DisableLooping() int32_t StartVibrator(const char *effectId) { - if (effectId == nullptr) { - HiLog::Error(LABEL, "%{public}s effectId is null", __func__); + if (effectId == NULL) { + MISC_HILOGE("effectId is null"); return OHOS::Sensors::ERROR; } bool isLooping = (g_loopingFlag == 1) ? true : false; auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Vibrate(DEFAULT_VIBRATOR_ID, effectId, isLooping); if (ret != OHOS::ERR_OK) { - HiLog::Error(LABEL, "%{public}s vibrator effectId failed, ret: %{public}d", __func__, ret); + MISC_HILOGE("vibrator effectId failed, ret: %{public}d", ret); return OHOS::Sensors::ERROR; } return OHOS::Sensors::SUCCESS; @@ -55,13 +55,13 @@ int32_t StartVibrator(const char *effectId) int32_t StartVibratorOnce(uint32_t duration) { if (duration == 0) { - HiLog::Error(LABEL, "%{public}s duration is invalid", __func__); + MISC_HILOGE("duration is invalid"); return OHOS::Sensors::ERROR; } auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Vibrate(DEFAULT_VIBRATOR_ID, duration); if (ret != OHOS::ERR_OK) { - HiLog::Error(LABEL, "%{public}s vibrator duration failed, ret: %{public}d", __func__, ret); + MISC_HILOGE("vibrator duration failed, ret: %{public}d", ret); return OHOS::Sensors::ERROR; } return OHOS::Sensors::SUCCESS; @@ -70,17 +70,17 @@ int32_t StartVibratorOnce(uint32_t duration) int32_t StopVibrator(const char *mode) { if (mode == nullptr) { - HiLog::Error(LABEL, "%{public}s mode is invalid", __func__); + MISC_HILOGE("mode is invalid"); return OHOS::Sensors::ERROR; } if (strcmp(mode, "time") != 0 && strcmp(mode, "preset") != 0) { - HiLog::Error(LABEL, "%{public}s mode is invalid, mode is %{public}s", __func__, mode); + MISC_HILOGE("mode is invalid, mode is %{public}s", mode); return OHOS::Sensors::ERROR; } auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Stop(DEFAULT_VIBRATOR_ID, mode); if (ret != OHOS::ERR_OK) { - HiLog::Error(LABEL, "%{public}s is failed, ret: %{public}d", __func__, ret); + MISC_HILOGE("client is failed, ret: %{public}d", ret); return OHOS::Sensors::ERROR; } return OHOS::Sensors::SUCCESS; diff --git a/interfaces/plugin/vibrator/src/vibrator_js.cpp b/interfaces/plugin/vibrator/src/vibrator_js.cpp index 056bede..65eb12e 100644 --- a/interfaces/plugin/vibrator/src/vibrator_js.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_js.cpp @@ -245,7 +245,7 @@ static napi_value Init(napi_env env, napi_value exports) static napi_module _module = { .nm_version = 1, .nm_flags = 0, - .nm_filename = nullptr, + .nm_filename = NULL, .nm_register_func = Init, .nm_modname = "vibrator", .nm_priv = ((void *)0), diff --git a/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp b/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp index 2213eab..e302970 100644 --- a/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_napi_utils.cpp @@ -27,12 +27,12 @@ AsyncCallbackInfo::~AsyncCallbackInfo() { CALL_LOG_ENTER; if (asyncWork != nullptr) { - HiLog::Debug(LABEL, "%{public}s delete work", __func__); + MISC_HILOGD("delete work"); napi_delete_async_work(env, asyncWork); } for (int32_t i = 0; i < CALLBACK_NUM; ++i) { if (callback[i] != nullptr) { - HiLog::Debug(LABEL, "%{public}s delete reference, i: %{public}d", __func__, i); + MISC_HILOGD("delete reference, i: %{public}d", i); napi_delete_reference(env, callback[i]); } } @@ -43,7 +43,7 @@ bool IsMatchType(const napi_env &env, const napi_value &value, const napi_valuet napi_valuetype paramType = napi_undefined; NAPI_CALL_BASE(env, napi_typeof(env, value, ¶mType), false); if (paramType != type) { - HiLog::Error(LABEL, "%{public}s Type mismatch", __func__); + MISC_HILOGE("Type mismatch"); return false; } return true; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index a6e6428..540080d 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -93,43 +93,43 @@ MiscdeviceService::~MiscdeviceService() void MiscdeviceService::OnDump() { - HiLog::Info(LABEL, "%{public}s is invoked", __func__); + MISC_HILOGI("ondump is invoked"); } void MiscdeviceService::OnStart() { - HiLog::Info(LABEL, "%{public}s begin", __func__); + MISC_HILOGI("onstart begin"); if (state_ == MiscdeviceServiceState::STATE_RUNNING) { - HiLog::Warn(LABEL, "%{public}s already started", __func__); + MISC_HILOGW("state_ already started"); return; } if (!InitInterface()) { - HiLog::Error(LABEL, "%{public}s Init interface error", __func__); + MISC_HILOGE("Init interface error"); return; } if (!SystemAbility::Publish(this)) { - HiLog::Error(LABEL, "%{public}s publish MiscdeviceService failed", __func__); + MISC_HILOGE("publish MiscdeviceService failed"); return; } auto ret = miscDdeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); if (!ret.second) { - HiLog::Info(LABEL, "%{public}s light exist in miscDdeviceIdMap_", __func__); + MISC_HILOGI("light exist in miscDdeviceIdMap_"); ret.first->second = lightExist_; } ret = miscDdeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); if (!ret.second) { - HiLog::Info(LABEL, "%{public}s vibrator exist in miscDdeviceIdMap_", __func__); + MISC_HILOGI("vibrator exist in miscDdeviceIdMap_"); ret.first->second = vibratorExist_; } state_ = MiscdeviceServiceState::STATE_RUNNING; - HiLog::Info(LABEL, "%{public}s end", __func__); + MISC_HILOGI("onstart end"); } bool MiscdeviceService::InitInterface() { auto ret = vibratorHdiConnection_.ConnectHdi(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s InitVibratorServiceImpl failed", __func__); + MISC_HILOGE("InitVibratorServiceImpl failed"); return false; } return true; @@ -137,24 +137,24 @@ bool MiscdeviceService::InitInterface() void MiscdeviceService::OnStop() { - HiLog::Info(LABEL, "%{public}s begin", __func__); + MISC_HILOGI("onstop begin"); if (state_ == MiscdeviceServiceState::STATE_STOPPED) { - HiLog::Warn(LABEL, "%{public}s MiscdeviceService stopped already", __func__); + MISC_HILOGW("MiscdeviceService stopped already"); return; } state_ = MiscdeviceServiceState::STATE_STOPPED; int32_t ret = vibratorHdiConnection_.DestroyHdiConnection(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s destroy hdi connection fail", __func__); + MISC_HILOGE("destroy hdi connection fail"); } - HiLog::Info(LABEL, "%{public}s end", __func__); + MISC_HILOGI("onstop end"); } bool MiscdeviceService::IsAbilityAvailable(MiscdeviceDeviceId groupID) { auto it = miscDdeviceIdMap_.find(groupID); if (it == miscDdeviceIdMap_.end()) { - HiLog::Error(LABEL, "%{public}s cannot find groupID : %{public}d", __func__, groupID); + MISC_HILOGE("cannot find groupID : %{public}d",groupID); return false; } return it->second; @@ -174,7 +174,7 @@ std::vector MiscdeviceService::GetVibratorIdList() int32_t MiscdeviceService::Vibrate(int32_t vibratorId, uint32_t timeOut) { if ((timeOut < MIN_VIBRATOR_TIME) || (timeOut > MAX_VIBRATOR_TIME)) { - HiLog::Error(LABEL, "%{public}s timeOut is invalid, timeOut : %{public}u", __func__, timeOut); + MISC_HILOGE("timeOut is invalid, timeOut : %{public}u", timeOut); return ERR_INVALID_VALUE; } std::lock_guard vibratorEffectLock(vibratorEffectMutex_); @@ -195,16 +195,15 @@ int32_t MiscdeviceService::CancelVibrator(int32_t vibratorId) std::lock_guard vibratorEffectLock(vibratorEffectMutex_); auto it = vibratorEffectMap_.find(vibratorId); if (it != vibratorEffectMap_.end() && it->second == "time") { - HiLog::Info(LABEL, "%{public}s stop mode is %{public}s", __func__, it->second.c_str()); + MISC_HILOGI("stop mode is %{public}s",it->second.c_str()); vibratorEffectMap_.clear(); } else { - HiLog::Error(LABEL, "%{public}s is failed", __func__); + MISC_HILOGE("vibratorEffectMap_ is failed"); return ERROR; } if (vibratorThread_ != nullptr) { while (vibratorThread_->IsRunning()) { - HiLog::Info(LABEL, "%{public}s stop previous vibratorThread, vibratorId : %{public}d", __func__, - vibratorId); + MISC_HILOGI("stop previous vibratorThread, vibratorId : %{public}d", vibratorId); vibratorThread_->NotifyExit(); vibratorThread_->NotifyExitSync(); } @@ -219,7 +218,7 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str if (it != vibratorEffectMap_.end()) { if (it->second == "time") { if ((vibratorThread_ != nullptr) && (vibratorThread_->IsRunning())) { - HiLog::Info(LABEL, "%{public}s stop previous vibratorThread", __func__); + MISC_HILOGI("stop previous vibratorThread"); vibratorThread_->NotifyExit(); vibratorThread_->NotifyExitSync(); } @@ -235,7 +234,7 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str } std::unordered_map::iterator iter = hapticRingMap_.find(effect); if (iter == hapticRingMap_.end()) { - HiLog::Error(LABEL, "%{public}s is not exist", __func__); + MISC_HILOGE("hapticRingMap_ is not exist"); return ERROR; } vibratorEffectMap_[vibratorId] = effect; @@ -245,18 +244,18 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str if (vibratorEffectThread_ == nullptr) { vibratorEffectThread_ = std::make_unique(*this); if (vibratorEffectThread_ == nullptr) { - HiLog::Error(LABEL, "%{public}s vibratorEffectThread_ cannot be null", __func__); + MISC_HILOGE("vibratorEffectThread_ cannot be null"); return ERROR; } } } while (vibratorEffectThread_->IsRunning()) { - HiLog::Debug(LABEL, "%{public}s notify the vibratorEffectThread", __func__); + MISC_HILOGD("notify the vibratorEffectThread"); ready_ = true; conditionVar_.notify_one(); ready_ = false; } - HiLog::Debug(LABEL, "%{public}s update vibrator effect data and start", __func__); + MISC_HILOGD("update vibrator effect data and start"); vibratorEffectThread_->UpdateVibratorEffectData(effect, delayTiming); vibratorEffectThread_->Start("VibratorEffectThread"); return NO_ERROR; @@ -266,7 +265,7 @@ int32_t MiscdeviceService::PlayCustomVibratorEffect(int32_t vibratorId, const st const std::vector &intensity, int32_t periodCount) { if (!MiscdeviceCommon::CheckCustomVibratorEffect(timing, intensity, periodCount)) { - HiLog::Error(LABEL, "%{public}s params are invalid", __func__); + MISC_HILOGE("params are invalid"); return ERR_INVALID_VALUE; } std::lock_guard vibratorEffectLock(vibratorEffectMutex_); @@ -284,18 +283,18 @@ int32_t MiscdeviceService::PlayCustomVibratorEffect(int32_t vibratorId, const st if (vibratorThread_ == nullptr) { vibratorThread_ = new (std::nothrow) VibratorThread(*this); if (vibratorThread_ == nullptr) { - HiLog::Error(LABEL, "%{public}s vibratorThread_ cannot be null", __func__); + MISC_HILOGE("vibratorThread_ cannot be null"); return ERROR; } } } // check current vibrator execution sequences and abort while (vibratorThread_->IsRunning()) { - HiLog::Info(LABEL, "%{public}s stop previous vibratorThread, vibratorId : %{public}d", __func__, vibratorId); + MISC_HILOGI("stop previous vibratorThread, vibratorId : %{public}d", vibratorId); vibratorThread_->NotifyExit(); vibratorThread_->NotifyExitSync(); } - HiLog::Info(LABEL, "%{public}s update vibrator data and start, vibratorId : %{public}d", __func__, vibratorId); + MISC_HILOGI("update vibrator data and start, vibratorId : %{public}d", vibratorId); vibratorThread_->UpdateVibratorData(timing, intensity, periodCount); vibratorThread_->Start("VibratorThread"); return NO_ERROR; @@ -307,18 +306,17 @@ int32_t MiscdeviceService::StopVibratorEffect(int32_t vibratorId, const std::str std::lock_guard vibratorEffectLock(vibratorEffectMutex_); auto it = vibratorEffectMap_.find(vibratorId); if ((it != vibratorEffectMap_.end()) && (it->second != "time")) { - HiLog::Info(LABEL, "%{public}s vibrator effect is %{public}s", __func__, it->second.c_str()); + MISC_HILOGI("vibrator effect is %{public}s", it->second.c_str()); curEffect = it->second; vibratorEffectMap_.clear(); } else { - HiLog::Error(LABEL, "%{public}s is failed", __func__); + MISC_HILOGE("vibrator effect is failed"); return ERROR; } - HiLog::Info(LABEL, "%{public}s curEffect : %{public}s", __func__, curEffect.c_str()); + MISC_HILOGI("curEffect : %{public}s", curEffect.c_str()); if (vibratorEffectThread_ != nullptr) { while (vibratorEffectThread_->IsRunning()) { - HiLog::Debug(LABEL, "%{public}s notify the vibratorEffectThread, vibratorId : %{public}d", - __func__, vibratorId); + MISC_HILOGD("notify the vibratorEffectThread, vibratorId : %{public}d", vibratorId); ready_ = true; conditionVar_.notify_one(); ready_ = false; diff --git a/services/miscdevice_service/src/miscdevice_service_stub.cpp b/services/miscdevice_service/src/miscdevice_service_stub.cpp index 3eebdb8..eb30b4e 100644 --- a/services/miscdevice_service/src/miscdevice_service_stub.cpp +++ b/services/miscdevice_service/src/miscdevice_service_stub.cpp @@ -36,7 +36,7 @@ const std::string VIBRATE_PERMISSION = "ohos.permission.VIBRATE"; MiscdeviceServiceStub::MiscdeviceServiceStub() { - HiLog::Info(LABEL, "%{public}s begin, %{public}p", __func__, this); + MISC_HILOGI("MiscdeviceServiceStub begin, %{public}p", this); baseFuncs_[IS_ABILITY_AVAILABLE] = &MiscdeviceServiceStub::IsAbilityAvailablePb; baseFuncs_[IS_VIBRATOR_EFFECT_AVAILABLE] = &MiscdeviceServiceStub::IsVibratorEffectAvailablePb; baseFuncs_[GET_VIBRATOR_ID_LIST] = &MiscdeviceServiceStub::GetVibratorIdListPb; @@ -56,7 +56,7 @@ MiscdeviceServiceStub::MiscdeviceServiceStub() MiscdeviceServiceStub::~MiscdeviceServiceStub() { - HiLog::Info(LABEL, "%{public}s begin, xigou %{public}p", __func__, this); + MISC_HILOGI("~MiscdeviceServiceStub begin, xigou %{public}p", this); baseFuncs_.clear(); } @@ -79,7 +79,7 @@ int32_t MiscdeviceServiceStub::VibratePb(MessageParcel &data, MessageParcel &rep { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); if (!permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION)) { - HiLog::Error(LABEL, "%{public}s permission denied", __func__); + MISC_HILOGE("permissionUtil denied"); return ERR_PERMISSION_DENIED; } return Vibrate(data.ReadInt32(), data.ReadUint32()); @@ -97,7 +97,7 @@ int32_t MiscdeviceServiceStub::CancelVibratorPb(MessageParcel &data, MessageParc { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); if (!permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION)) { - HiLog::Error(LABEL, "%{public}s permission denied", __func__); + MISC_HILOGE("permissionUtil denied"); return ERR_PERMISSION_DENIED; } int32_t vibratorId = data.ReadInt32(); @@ -108,7 +108,7 @@ int32_t MiscdeviceServiceStub::PlayVibratorEffectPb(MessageParcel &data, Message { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); if (!permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION)) { - HiLog::Error(LABEL, "%{public}s permission denied", __func__); + MISC_HILOGE("permissionUtil denied"); return ERR_PERMISSION_DENIED; } int32_t vibratorId = data.ReadInt32(); @@ -121,7 +121,7 @@ int32_t MiscdeviceServiceStub::PlayCustomVibratorEffectPb(MessageParcel &data, M { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); if (!permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION)) { - HiLog::Error(LABEL, "%{public}s permission denied", __func__); + MISC_HILOGE("permissionUtil denied"); return ERR_PERMISSION_DENIED; } int32_t vibratorId = data.ReadInt32(); @@ -137,7 +137,7 @@ int32_t MiscdeviceServiceStub::StopVibratorEffectPb(MessageParcel &data, Message { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); if (!permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION)) { - HiLog::Error(LABEL, "%{public}s permission denied", __func__); + MISC_HILOGE("permissionUtil denied"); return ERR_PERMISSION_DENIED; } int32_t vibratorId = data.ReadInt32(); @@ -149,7 +149,7 @@ int32_t MiscdeviceServiceStub::SetVibratorParameterPb(MessageParcel &data, Messa { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); if (!permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION)) { - HiLog::Error(LABEL, "%{public}s permission denied", __func__); + MISC_HILOGE("permissionUtil denied"); return ERR_PERMISSION_DENIED; } int32_t vibratorId = data.ReadInt32(); @@ -208,11 +208,11 @@ int32_t MiscdeviceServiceStub::StopLightEffectPb(MessageParcel &data, MessagePar int32_t MiscdeviceServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - HiLog::Debug(LABEL, "%{public}s begin, cmd : %{public}u", __func__, code); + MISC_HILOGD("remoterequest begin, cmd : %{public}u", code); std::u16string descriptor = MiscdeviceServiceStub::GetDescriptor(); std::u16string remoteDescriptor = data.ReadInterfaceToken(); if (descriptor != remoteDescriptor) { - HiLog::Error(LABEL, "%{public}s client and service descriptors are inconsistent", __func__); + MISC_HILOGE("client and service descriptors are inconsistent"); return OBJECT_NULL; } auto itFunc = baseFuncs_.find(code); @@ -222,7 +222,7 @@ int32_t MiscdeviceServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &dat return (this->*memberFunc)(data, reply); } } - HiLog::Debug(LABEL, "%{public}s no member function default process", __func__); + MISC_HILOGD("remoterequest no member function default process"); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } } // namespace Sensors diff --git a/utils/src/dmd_report.cpp b/utils/src/dmd_report.cpp index 6831b61..c20c75c 100644 --- a/utils/src/dmd_report.cpp +++ b/utils/src/dmd_report.cpp @@ -63,11 +63,11 @@ static std::string GetEventName(int32_t eventId) void DmdReport::ReportException(int32_t eventId, const std::string &interfaceName, int32_t error) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + MISC_HILOGD("ReportException begin"); std::lock_guard eventLock(eventMutex_); auto eventIt = eventMap_.find(eventId); if (eventIt == eventMap_.end()) { - HiLog::Error(LABEL, "%{public}s eventId : %{public}d doesn't support", __func__, eventId); + MISC_HILOGE("%{public}d doesn't support", eventId); return; } int64_t curTime = GetSecondsSince1970ToNow(); @@ -75,10 +75,10 @@ void DmdReport::ReportException(int32_t eventId, const std::string &interfaceNam HiviewDFX::HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, GetEventName(eventId), HiviewDFX::HiSysEvent::EventType::FAULT, interfaceName, error); eventMap_[eventId] = curTime; - HiLog::Debug(LABEL, "%{public}s end", __func__); + MISC_HILOGD("ReportException end"); return; } - HiLog::Warn(LABEL, "%{public}s every eventId report one time half an hour", __func__); + MISC_HILOGW("every eventId report one time half an hour"); } } // namespace Sensors } // namespace OHOS diff --git a/utils/src/miscdevice_common.cpp b/utils/src/miscdevice_common.cpp index 5520dee..c85b3d7 100755 --- a/utils/src/miscdevice_common.cpp +++ b/utils/src/miscdevice_common.cpp @@ -16,6 +16,8 @@ #include "miscdevice_common.h" #include "sensors_log_domain.h" +#include "sensors_errors.h" + namespace OHOS { namespace Sensors { using namespace OHOS::HiviewDFX; @@ -33,11 +35,11 @@ bool MiscdeviceCommon::CheckCustomVibratorEffect(const std::vector &tim const std::vector &intensity, int32_t periodCount) { if ((periodCount < MIN_VIBRATOR_COUNT) || (periodCount > MAX_VIBRATOR_COUNT)) { - HiLog::Error(LABEL, "%{public}s failed, input param invalid", __func__); + MISC_HILOGW("input param invalid is failed"); return false; } if (timing.size() != intensity.size()) { - HiLog::Error(LABEL, "%{public}s failed, timing size invalid", __func__); + MISC_HILOGW("timing size invalid is failed"); return false; } int32_t totalTime = 0; @@ -45,7 +47,7 @@ bool MiscdeviceCommon::CheckCustomVibratorEffect(const std::vector &tim totalTime += timing[i]; } if (totalTime > HALF_AN_HOUR) { - HiLog::Error(LABEL, "%{public}s failed, totalTime invalid", __func__); + MISC_HILOGW("totalTime invalid is failed"); return false; } for (uint32_t i = 0; i < intensity.size(); i++) { diff --git a/utils/src/miscdevice_log.h b/utils/src/miscdevice_log.h new file mode 100644 index 0000000..8623a13 --- /dev/null +++ b/utils/src/miscdevice_log.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MISCDEVICE_LOG_H +#define MISCDEVICE_LOG_H + +#include "hilog/log.h" + +#include "miscdevice_log.h" +#include "sensors_errors.h" + +namespace OHOS { +namespace Sensors { +namespace { +constexpr uint32_t MISC_LOG_DOMAIN = 0xD002800; +} // namespace +#ifndef MISC_FUNC_FMT +#define MISC_FUNC_FMT "in %{public}s, #%{public}d, " +#endif + +#ifndef MISC_FUNC_INFO +#define MISC_FUNC_INFO __FUNCTION__, __LINE__ +#endif + +#define MISC_HILOGD(fmt, ...) do { \ + OHOS::HiviewDFX::HiLog::Debug(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ +} while (0) +#define MISC_HILOGI(fmt, ...) do { \ + OHOS::HiviewDFX::HiLog::Info(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ +} while (0) +#define MISC_HILOGW(fmt, ...) do { \ + OHOS::HiviewDFX::HiLog::Warn(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ +} while (0) +#define MISC_HILOGE(fmt, ...) do { \ + OHOS::HiviewDFX::HiLog::Error(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ +} while (0) +#define MISC_LOGF(fmt, ...) do { \ + OHOS::HiviewDFX::HiLog::Fatal(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ +} while (0) +} // namespace Sensors +} // namespace OHOS +#endif // MISCDEVICE_LOG_H \ No newline at end of file diff --git a/utils/src/permission_util.cpp b/utils/src/permission_util.cpp index 9337c94..42759f3 100644 --- a/utils/src/permission_util.cpp +++ b/utils/src/permission_util.cpp @@ -31,10 +31,10 @@ bool PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, std::stri { int32_t result = AccessTokenKit::VerifyAccessToken(callerToken, permissionName); if (result != PERMISSION_GRANTED) { - HiLog::Error(LABEL, "%{public}s grant failed, result: %{public}d", __func__, result); + MISC_HILOGW("result grant failed, result: %{public}d", result); return false; } - HiLog::Debug(LABEL, "%{public}s grant success", __func__); + MISC_HILOGD( "result grant success"); return true; } } // namespace Sensors -- Gitee From b611e38dcdbe06a64f7c3936bf98f4f834ae0dec Mon Sep 17 00:00:00 2001 From: cff-gite Date: Wed, 30 Mar 2022 18:29:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9vibrator=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- interfaces/native/vibrator/src/vibrator_agent.cpp | 2 +- interfaces/plugin/vibrator/src/vibrator_js.cpp | 2 +- services/miscdevice_service/src/miscdevice_service.cpp | 4 ++-- utils/include/miscdevice_log.h | 3 ++- utils/src/permission_util.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index c2aec0f..dfe702b 100644 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -38,7 +38,7 @@ int32_t DisableLooping() int32_t StartVibrator(const char *effectId) { - if (effectId == NULL) { + if (effectId == nullptr) { MISC_HILOGE("effectId is null"); return OHOS::Sensors::ERROR; } diff --git a/interfaces/plugin/vibrator/src/vibrator_js.cpp b/interfaces/plugin/vibrator/src/vibrator_js.cpp index 65eb12e..056bede 100644 --- a/interfaces/plugin/vibrator/src/vibrator_js.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_js.cpp @@ -245,7 +245,7 @@ static napi_value Init(napi_env env, napi_value exports) static napi_module _module = { .nm_version = 1, .nm_flags = 0, - .nm_filename = NULL, + .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "vibrator", .nm_priv = ((void *)0), diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 540080d..4432978 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -154,7 +154,7 @@ bool MiscdeviceService::IsAbilityAvailable(MiscdeviceDeviceId groupID) { auto it = miscDdeviceIdMap_.find(groupID); if (it == miscDdeviceIdMap_.end()) { - MISC_HILOGE("cannot find groupID : %{public}d",groupID); + MISC_HILOGE("cannot find groupID : %{public}d", groupID); return false; } return it->second; @@ -195,7 +195,7 @@ int32_t MiscdeviceService::CancelVibrator(int32_t vibratorId) std::lock_guard vibratorEffectLock(vibratorEffectMutex_); auto it = vibratorEffectMap_.find(vibratorId); if (it != vibratorEffectMap_.end() && it->second == "time") { - MISC_HILOGI("stop mode is %{public}s",it->second.c_str()); + MISC_HILOGI("stop mode is %{public}s", it->second.c_str()); vibratorEffectMap_.clear(); } else { MISC_HILOGE("vibratorEffectMap_ is failed"); diff --git a/utils/include/miscdevice_log.h b/utils/include/miscdevice_log.h index fa3e8f2..f2e0283 100755 --- a/utils/include/miscdevice_log.h +++ b/utils/include/miscdevice_log.h @@ -17,8 +17,9 @@ #include "hilog/log.h" -#include "miscdevice_log.h" #include "sensors_errors.h" +#include "miscdevice_log.h" + namespace OHOS { namespace Sensors { diff --git a/utils/src/permission_util.cpp b/utils/src/permission_util.cpp index 42759f3..33b1603 100644 --- a/utils/src/permission_util.cpp +++ b/utils/src/permission_util.cpp @@ -34,7 +34,7 @@ bool PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, std::stri MISC_HILOGW("result grant failed, result: %{public}d", result); return false; } - MISC_HILOGD( "result grant success"); + MISC_HILOGD("result grant success"); return true; } } // namespace Sensors -- Gitee From 818dd70c5559ff2f33fcd525491da6d7243ddedf Mon Sep 17 00:00:00 2001 From: cff-gite Date: Thu, 31 Mar 2022 09:31:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9vibrator=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- utils/src/miscdevice_log.h | 53 -------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 utils/src/miscdevice_log.h diff --git a/utils/src/miscdevice_log.h b/utils/src/miscdevice_log.h deleted file mode 100644 index 8623a13..0000000 --- a/utils/src/miscdevice_log.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef MISCDEVICE_LOG_H -#define MISCDEVICE_LOG_H - -#include "hilog/log.h" - -#include "miscdevice_log.h" -#include "sensors_errors.h" - -namespace OHOS { -namespace Sensors { -namespace { -constexpr uint32_t MISC_LOG_DOMAIN = 0xD002800; -} // namespace -#ifndef MISC_FUNC_FMT -#define MISC_FUNC_FMT "in %{public}s, #%{public}d, " -#endif - -#ifndef MISC_FUNC_INFO -#define MISC_FUNC_INFO __FUNCTION__, __LINE__ -#endif - -#define MISC_HILOGD(fmt, ...) do { \ - OHOS::HiviewDFX::HiLog::Debug(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ -} while (0) -#define MISC_HILOGI(fmt, ...) do { \ - OHOS::HiviewDFX::HiLog::Info(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ -} while (0) -#define MISC_HILOGW(fmt, ...) do { \ - OHOS::HiviewDFX::HiLog::Warn(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ -} while (0) -#define MISC_HILOGE(fmt, ...) do { \ - OHOS::HiviewDFX::HiLog::Error(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ -} while (0) -#define MISC_LOGF(fmt, ...) do { \ - OHOS::HiviewDFX::HiLog::Fatal(LABEL, MISC_FUNC_FMT fmt, MISC_FUNC_INFO, ##__VA_ARGS__); \ -} while (0) -} // namespace Sensors -} // namespace OHOS -#endif // MISCDEVICE_LOG_H \ No newline at end of file -- Gitee From 189c86c92568af4966e876e50c6f53992aa9837e Mon Sep 17 00:00:00 2001 From: cff-gite Date: Thu, 31 Mar 2022 09:51:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9vibrator=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- utils/src/miscdevice_common.cpp | 6 +++--- utils/src/permission_util.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/src/miscdevice_common.cpp b/utils/src/miscdevice_common.cpp index c85b3d7..454cb75 100755 --- a/utils/src/miscdevice_common.cpp +++ b/utils/src/miscdevice_common.cpp @@ -35,11 +35,11 @@ bool MiscdeviceCommon::CheckCustomVibratorEffect(const std::vector &tim const std::vector &intensity, int32_t periodCount) { if ((periodCount < MIN_VIBRATOR_COUNT) || (periodCount > MAX_VIBRATOR_COUNT)) { - MISC_HILOGW("input param invalid is failed"); + MISC_HILOGE("input param invalid is failed"); return false; } if (timing.size() != intensity.size()) { - MISC_HILOGW("timing size invalid is failed"); + MISC_HILOGE("timing size invalid is failed"); return false; } int32_t totalTime = 0; @@ -47,7 +47,7 @@ bool MiscdeviceCommon::CheckCustomVibratorEffect(const std::vector &tim totalTime += timing[i]; } if (totalTime > HALF_AN_HOUR) { - MISC_HILOGW("totalTime invalid is failed"); + MISC_HILOGE("totalTime invalid is failed"); return false; } for (uint32_t i = 0; i < intensity.size(); i++) { diff --git a/utils/src/permission_util.cpp b/utils/src/permission_util.cpp index 33b1603..e62aebd 100644 --- a/utils/src/permission_util.cpp +++ b/utils/src/permission_util.cpp @@ -31,7 +31,7 @@ bool PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, std::stri { int32_t result = AccessTokenKit::VerifyAccessToken(callerToken, permissionName); if (result != PERMISSION_GRANTED) { - MISC_HILOGW("result grant failed, result: %{public}d", result); + MISC_HILOGE("result grant failed, result: %{public}d", result); return false; } MISC_HILOGD("result grant success"); -- Gitee From 9f44b53d11d7349a1f1befc685d0afbfaa2d886c Mon Sep 17 00:00:00 2001 From: cff-gite Date: Thu, 31 Mar 2022 17:59:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9vibrator=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff-gite --- .../miscdevice/src/light_service_client.cpp | 12 ++++---- .../src/vibrator_service_client.cpp | 14 ++++----- .../native/vibrator/src/vibrator_agent.cpp | 10 ++----- .../adpter/src/compatible_connection.cpp | 25 ++++++++-------- .../adpter/src/hdi_connection.cpp | 30 +++++++++---------- .../interface/src/vibrator_hdi_connection.cpp | 12 ++++---- .../src/miscdevice_service.cpp | 6 ++-- utils/src/dmd_report.cpp | 5 ++-- 8 files changed, 52 insertions(+), 62 deletions(-) diff --git a/frameworks/native/miscdevice/src/light_service_client.cpp b/frameworks/native/miscdevice/src/light_service_client.cpp index 0ec1e49..bf121f2 100644 --- a/frameworks/native/miscdevice/src/light_service_client.cpp +++ b/frameworks/native/miscdevice/src/light_service_client.cpp @@ -65,7 +65,7 @@ int32_t LightServiceClient::InitServiceClient() std::vector LightServiceClient::GetLightIdList() { - MISC_HILOGD("getLightIdList begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -76,7 +76,7 @@ std::vector LightServiceClient::GetLightIdList() bool LightServiceClient::IsLightEffectSupport(int32_t lightId, const std::string &effectId) { - MISC_HILOGD("light effect support begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -87,7 +87,7 @@ bool LightServiceClient::IsLightEffectSupport(int32_t lightId, const std::string int32_t LightServiceClient::Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) { - MISC_HILOGD("Light begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -98,7 +98,7 @@ int32_t LightServiceClient::Light(int32_t lightId, uint64_t brightness, uint32_t int32_t LightServiceClient::PlayLightEffect(int32_t lightId, const std::string &type) { - MISC_HILOGD("playLightEffect begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -109,7 +109,7 @@ int32_t LightServiceClient::PlayLightEffect(int32_t lightId, const std::string & int32_t LightServiceClient::StopLightEffect(int32_t lightId) { - MISC_HILOGD("stopLightEffect begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -120,7 +120,7 @@ int32_t LightServiceClient::StopLightEffect(int32_t lightId) void LightServiceClient::ProcessDeathObserver(const wptr &object) { - MISC_HILOGD("processDeathObserver begin"); + CALL_LOG_ENTER; (void)object; miscdeviceProxy_ = nullptr; auto ret = InitServiceClient(); diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index e9188b7..4eaeccd 100755 --- a/frameworks/native/miscdevice/src/vibrator_service_client.cpp +++ b/frameworks/native/miscdevice/src/vibrator_service_client.cpp @@ -35,7 +35,7 @@ constexpr uint32_t WAIT_MS = 200; int32_t VibratorServiceClient::InitServiceClient() { - MISC_HILOGD("initServiceClient begin"); + CALL_LOG_ENTER; std::lock_guard clientLock(clientMutex_); if (miscdeviceProxy_ != nullptr) { MISC_HILOGW("miscdeviceProxy_ already init"); @@ -69,7 +69,7 @@ int32_t VibratorServiceClient::InitServiceClient() std::vector VibratorServiceClient::GetVibratorIdList() { - MISC_HILOGD("getVibratorIdList begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -80,7 +80,7 @@ std::vector VibratorServiceClient::GetVibratorIdList() bool VibratorServiceClient::IsVibratorEffectSupport(int32_t vibratorId, const std::string &effect) { - MISC_HILOGD("vibratorEffectSupport begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -114,7 +114,7 @@ int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, const std::string &ef int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, std::vector timing, std::vector intensity, int32_t periodCount) { - MISC_HILOGD("Vibrate begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -141,7 +141,7 @@ int32_t VibratorServiceClient::Stop(int32_t vibratorId, const std::string &type) int32_t VibratorServiceClient::SetVibratorParameter(int32_t vibratorId, const std::string &cmd) { - MISC_HILOGD("SetVibratorParameter begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -152,7 +152,7 @@ int32_t VibratorServiceClient::SetVibratorParameter(int32_t vibratorId, const st std::string VibratorServiceClient::GetVibratorParameter(int32_t vibratorId, const std::string &command) { - MISC_HILOGD("GetVibratorParameter begin"); + CALL_LOG_ENTER; int32_t ret = InitServiceClient(); if (ret != ERR_OK) { MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); @@ -163,7 +163,7 @@ std::string VibratorServiceClient::GetVibratorParameter(int32_t vibratorId, cons void VibratorServiceClient::ProcessDeathObserver(const wptr &object) { - MISC_HILOGD("ProcessDeathObserver begin"); + CALL_LOG_ENTER; (void)object; miscdeviceProxy_ = nullptr; int32_t ret = InitServiceClient(); diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index dfe702b..fc0075b 100644 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -38,10 +38,7 @@ int32_t DisableLooping() int32_t StartVibrator(const char *effectId) { - if (effectId == nullptr) { - MISC_HILOGE("effectId is null"); - return OHOS::Sensors::ERROR; - } + CHKPR(effectId, OHOS::Sensors::ERROR); bool isLooping = (g_loopingFlag == 1) ? true : false; auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Vibrate(DEFAULT_VIBRATOR_ID, effectId, isLooping); @@ -69,10 +66,7 @@ int32_t StartVibratorOnce(uint32_t duration) int32_t StopVibrator(const char *mode) { - if (mode == nullptr) { - MISC_HILOGE("mode is invalid"); - return OHOS::Sensors::ERROR; - } + CHKPR(mode, OHOS::Sensors::ERROR); if (strcmp(mode, "time") != 0 && strcmp(mode, "preset") != 0) { MISC_HILOGE("mode is invalid, mode is %{public}s", mode); return OHOS::Sensors::ERROR; diff --git a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp index fff9419..18b5cd2 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp @@ -36,15 +36,15 @@ std::atomic_bool CompatibleConnection::isStop_ = false; int32_t CompatibleConnection::ConnectHdi() { - HiLog::Info(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; return ERR_OK; } int32_t CompatibleConnection::StartOnce(uint32_t duration) { - HiLog::Info(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; if (duration > MAX_VIBRATOR_TIME || duration <= MIN_VIBRATOR_TIME) { - HiLog::Error(LABEL, "%{public}s duration: %{public}d invalid", __func__, duration); + MISC_HILOGE("duration: %{public}d invalid", duration); return VIBRATOR_ON_ERR; } duration_ = duration; @@ -59,9 +59,9 @@ int32_t CompatibleConnection::StartOnce(uint32_t duration) int32_t CompatibleConnection::Start(const char *effectType) { - HiLog::Info(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; if (std::find(vibratorEffect_.begin(), vibratorEffect_.end(), effectType) == vibratorEffect_.end()) { - HiLog::Error(LABEL, "%{public}s not support %{public}s type", __func__, effectType); + MISC_HILOGE("Not support %{public}s type", effectType); return VIBRATOR_ON_ERR; } if (!vibrateThread_.joinable()) { @@ -75,17 +75,17 @@ int32_t CompatibleConnection::Start(const char *effectType) int32_t CompatibleConnection::Stop(VibratorStopMode mode) { - HiLog::Info(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; if (mode < 0 || mode >= VIBRATOR_STOP_MODE_INVALID) { - HiLog::Error(LABEL, "%{public}s mode: %{public}d invalid", __func__, mode); + MISC_HILOGE("mode: %{public}d invalid", mode); return VIBRATOR_OFF_ERR; } if (vibrateMode_ != mode) { - HiLog::Error(LABEL, "%{public}s should start vibrate first", __func__); + MISC_HILOGE("should start vibrate first"); return VIBRATOR_OFF_ERR; } if (vibrateThread_.joinable()) { - HiLog::Info(LABEL, "%{public}s stop vibrate thread", __func__); + MISC_HILOGI("stop vibrate thread"); isStop_ = true; vibrateThread_.join(); } @@ -94,21 +94,20 @@ int32_t CompatibleConnection::Stop(VibratorStopMode mode) int32_t CompatibleConnection::DestroyHdiConnection() { - HiLog::Info(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; return ERR_OK; } void CompatibleConnection::VibrateProcess() { - HiLog::Info(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; clock_t vibrateStartTime = clock(); while (static_cast(clock() - vibrateStartTime) < duration_) { if (isStop_) { - HiLog::Info(LABEL, "%{public}s thread should stop", __func__); + MISC_HILOGI("thread should stop"); break; } } - HiLog::Info(LABEL, "%{public}s end", __func__); return; } } // namespace Sensors diff --git a/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp index efd8dc0..aab4200 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp @@ -28,7 +28,7 @@ constexpr uint32_t WAIT_MS = 100; int32_t HdiConnection::ConnectHdi() { - HiLog::Debug(LABEL, "%{public}s in", __func__); + CALL_LOG_ENTER; int32_t retry = 0; while (retry < GET_HDI_SERVICE_COUNT) { vibratorInterface_ = IVibratorInterface::Get(); @@ -37,10 +37,10 @@ int32_t HdiConnection::ConnectHdi() return ERR_OK; } retry++; - HiLog::Warn(LABEL, "%{public}s connect hdi service failed, retry : %{public}d", __func__, retry); + MISC_HILOGW("connect hdi service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); } - HiLog::Error(LABEL, "%{public}s failed, vibrator interface initialization failed", __func__); + MISC_HILOGE("vibrator interface initialization failed"); return ERR_INVALID_VALUE; } @@ -48,7 +48,7 @@ int32_t HdiConnection::StartOnce(uint32_t duration) { int32_t ret = vibratorInterface_->StartOnce(duration); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("StartOnce failed"); return ret; } return ERR_OK; @@ -57,12 +57,12 @@ int32_t HdiConnection::StartOnce(uint32_t duration) int32_t HdiConnection::Start(const char *effectType) { if (effectType == nullptr) { - HiLog::Error(LABEL, "%{public}s effectType is null", __func__); + MISC_HILOGE("effectType is null"); return VIBRATOR_ON_ERR; } int32_t ret = vibratorInterface_->Start(effectType); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("Start failed"); return ret; } return ERR_OK; @@ -72,7 +72,7 @@ int32_t HdiConnection::Stop(VibratorStopMode mode) { int32_t ret = vibratorInterface_->Stop(static_cast(mode)); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("Stop failed"); return ret; } return ERR_OK; @@ -86,14 +86,14 @@ int32_t HdiConnection::DestroyHdiConnection() void HdiConnection::RegisterHdiDeathRecipient() { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + CALL_LOG_ENTER; if (vibratorInterface_ == nullptr) { - HiLog::Error(LABEL, "%{public}s connect v1_0 hdi failed", __func__); + MISC_HILOGE("connect v1_0 hdi failed"); return; } hdiDeathObserver_ = new (std::nothrow) DeathRecipientTemplate(*const_cast(this)); if (hdiDeathObserver_ == nullptr) { - HiLog::Error(LABEL, "%{public}s hdiDeathObserver_ cannot be null", __func__); + MISC_HILOGE("hdiDeathObserver_ cannot be null"); return; } vibratorInterface_->AsObject()->AddDeathRecipient(hdiDeathObserver_); @@ -101,9 +101,9 @@ void HdiConnection::RegisterHdiDeathRecipient() void HdiConnection::UnregisterHdiDeathRecipient() { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + CALL_LOG_ENTER; if (vibratorInterface_ == nullptr || hdiDeathObserver_ == nullptr) { - HiLog::Error(LABEL, "%{public}s vibratorInterface_ or hdiDeathObserver_ is null", __func__); + MISC_HILOGE("vibratorInterface_ or hdiDeathObserver_ is null"); return; } vibratorInterface_->AsObject()->RemoveDeathRecipient(hdiDeathObserver_); @@ -111,10 +111,10 @@ void HdiConnection::UnregisterHdiDeathRecipient() void HdiConnection::ProcessDeathObserver(const wptr &object) { - HiLog::Debug(LABEL, "%{public}s begin", __func__); + CALL_LOG_ENTER; sptr hdiService = object.promote(); if (hdiService == nullptr || hdiDeathObserver_ == nullptr) { - HiLog::Error(LABEL, "%{public}s invalid remote object or hdiDeathObserver_ is null", __func__); + MISC_HILOGE("invalid remote object or hdiDeathObserver_ is null"); return; } hdiService->RemoveDeathRecipient(hdiDeathObserver_); @@ -125,7 +125,7 @@ void HdiConnection::reconnect() { int32_t ret = ConnectHdi(); if (ret != ERR_OK) { - HiLog::Error(LABEL, "%{public}s connect hdi fail", __func__); + MISC_HILOGE("connect hdi fail"); } } } // namespace Sensors diff --git a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp index 4d6bf54..7fb2cf1 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp @@ -32,12 +32,12 @@ int32_t VibratorHdiConnection::ConnectHdi() iVibratorHdiConnection_ = std::make_unique(); int32_t ret = iVibratorHdiConnection_->ConnectHdi(); if (ret != 0) { - HiLog::Error(LABEL, "%{public}s hdi direct failed", __func__); + MISC_HILOGE("hdi direct failed"); iVibratorHdiConnection_ = std::make_unique(); ret = iVibratorHdiConnection_->ConnectHdi(); } if (ret != 0) { - HiLog::Error(LABEL, "%{public}s hdi connection failed", __func__); + MISC_HILOGE("hdi connection failed"); return VIBRATOR_HDF_CONNECT_ERR; } return ERR_OK; @@ -47,7 +47,7 @@ int32_t VibratorHdiConnection::StartOnce(uint32_t duration) { int32_t ret = iVibratorHdiConnection_->StartOnce(duration); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("StartOnce failed"); return VIBRATOR_ON_ERR; } return ERR_OK; @@ -57,7 +57,7 @@ int32_t VibratorHdiConnection::Start(const char *effectType) { int32_t ret = iVibratorHdiConnection_->Start(effectType); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("Start failed"); return VIBRATOR_ON_ERR; } return ERR_OK; @@ -67,7 +67,7 @@ int32_t VibratorHdiConnection::Stop(VibratorStopMode mode) { int32_t ret = iVibratorHdiConnection_->Stop(mode); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("Stop failed"); return VIBRATOR_OFF_ERR; } return ERR_OK; @@ -77,7 +77,7 @@ int32_t VibratorHdiConnection::DestroyHdiConnection() { int32_t ret = iVibratorHdiConnection_->DestroyHdiConnection(); if (ret < 0) { - HiLog::Error(LABEL, "%{public}s failed", __func__); + MISC_HILOGE("DestroyHdiConnection failed"); return VIBRATOR_HDF_CONNECT_ERR; } return ERR_OK; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 4432978..f6a8cc4 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -98,7 +98,7 @@ void MiscdeviceService::OnDump() void MiscdeviceService::OnStart() { - MISC_HILOGI("onstart begin"); + CALL_LOG_ENTER; if (state_ == MiscdeviceServiceState::STATE_RUNNING) { MISC_HILOGW("state_ already started"); return; @@ -122,7 +122,6 @@ void MiscdeviceService::OnStart() ret.first->second = vibratorExist_; } state_ = MiscdeviceServiceState::STATE_RUNNING; - MISC_HILOGI("onstart end"); } bool MiscdeviceService::InitInterface() @@ -137,7 +136,7 @@ bool MiscdeviceService::InitInterface() void MiscdeviceService::OnStop() { - MISC_HILOGI("onstop begin"); + CALL_LOG_ENTER; if (state_ == MiscdeviceServiceState::STATE_STOPPED) { MISC_HILOGW("MiscdeviceService stopped already"); return; @@ -147,7 +146,6 @@ void MiscdeviceService::OnStop() if (ret != ERR_OK) { MISC_HILOGE("destroy hdi connection fail"); } - MISC_HILOGI("onstop end"); } bool MiscdeviceService::IsAbilityAvailable(MiscdeviceDeviceId groupID) diff --git a/utils/src/dmd_report.cpp b/utils/src/dmd_report.cpp index c20c75c..4f0cacb 100644 --- a/utils/src/dmd_report.cpp +++ b/utils/src/dmd_report.cpp @@ -63,7 +63,7 @@ static std::string GetEventName(int32_t eventId) void DmdReport::ReportException(int32_t eventId, const std::string &interfaceName, int32_t error) { - MISC_HILOGD("ReportException begin"); + CALL_LOG_ENTER; std::lock_guard eventLock(eventMutex_); auto eventIt = eventMap_.find(eventId); if (eventIt == eventMap_.end()) { @@ -75,10 +75,9 @@ void DmdReport::ReportException(int32_t eventId, const std::string &interfaceNam HiviewDFX::HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::SENSORS, GetEventName(eventId), HiviewDFX::HiSysEvent::EventType::FAULT, interfaceName, error); eventMap_[eventId] = curTime; - MISC_HILOGD("ReportException end"); + MISC_HILOGD("More than half an hour"); return; } - MISC_HILOGW("every eventId report one time half an hour"); } } // namespace Sensors } // namespace OHOS -- Gitee