From 32372081675bcb2d4d751eef2166450df8e2200f Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Tue, 23 Jan 2024 11:24:21 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!148=20:?= =?UTF-8?q?=20DDL=E6=97=A5=E5=BF=97=E8=BD=BB=E9=87=8F=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/include/rme_log_domain.h | 17 +++++++++-------- .../frame_aware_collector/src/frame_msg_mgr.cpp | 4 +--- .../src/frame_window_mgr.cpp | 4 +--- .../src/rme_core_sched.cpp | 4 +--- .../src/intellisense_server.cpp | 4 +--- .../core/frame_aware_policy/src/para_config.cpp | 5 ++--- .../innerkits/frameintf/frame_msg_intf.cpp | 4 +--- .../innerkits/frameintf/frame_ui_intf.cpp | 4 +--- .../innerkits/frameintf/rtg_interface.cpp | 4 +--- qos_manager/src/qos_common.cpp | 5 ++--- 10 files changed, 20 insertions(+), 35 deletions(-) diff --git a/common/include/rme_log_domain.h b/common/include/rme_log_domain.h index 796f635..1fddcba 100644 --- a/common/include/rme_log_domain.h +++ b/common/include/rme_log_domain.h @@ -16,14 +16,12 @@ #ifndef RME_LOG_DOMAIN_H #define RME_LOG_DOMAIN_H -#undef LOG_DOMAIN -#define LOG_DOMAIN 0xD001706 - #include #include "hilog/log.h" namespace OHOS { namespace RmeLogDomain { +constexpr uint32_t RME_INTELLISENSE = 0xD001706; /* #ifdef RME_LOGF @@ -47,11 +45,14 @@ namespace RmeLogDomain { #endif */ -#define RME_LOGF(...) HILOG_FATAL(LOG_CORE, ##__VA_ARGS__) -#define RME_LOGE(...) HILOG_ERROR(LOG_CORE, ##__VA_ARGS__) -#define RME_LOGW(...) HILOG_WORN(LOG_CORE, ##__VA_ARGS__) -#define RME_LOGI(...) HILOG_INFO(LOG_CORE, ##__VA_ARGS__) -#define RME_LOGD(...) HILOG_DEBUG(LOG_CORE, ##__VA_ARGS__) +#define DEFINE_RMELOG_INTELLISENSE(name) \ + static constexpr OHOS::HiviewDFX::HiLogLabel RME_LOG_LABEL = {LOG_CORE, OHOS::RmeLogDomain::RME_INTELLISENSE, name} + +#define RME_LOGF(...) (void)OHOS::HiviewDFX::HiLog::Fatal(RME_LOG_LABEL, ##__VA_ARGS__) +#define RME_LOGE(...) (void)OHOS::HiviewDFX::HiLog::Error(RME_LOG_LABEL, ##__VA_ARGS__) +#define RME_LOGW(...) (void)OHOS::HiviewDFX::HiLog::Warn(RME_LOG_LABEL, ##__VA_ARGS__) +#define RME_LOGI(...) (void)OHOS::HiviewDFX::HiLog::Info(RME_LOG_LABEL, ##__VA_ARGS__) +#define RME_LOGD(...) (void)OHOS::HiviewDFX::HiLog::Debug(RME_LOG_LABEL, ##__VA_ARGS__) } // namespace RmeLogDomain } // namespace OHOS #endif // RME_LOG_DOMAIN_H diff --git a/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp b/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp index 7c8cf4a..c8d816d 100644 --- a/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp +++ b/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp @@ -19,11 +19,9 @@ #include #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "ueaClient-FrameMsgMgr" - namespace OHOS { namespace RME { +DEFINE_RMELOG_INTELLISENSE("ueaClient-FrameMsgMgr"); IMPLEMENT_SINGLE_INSTANCE(FrameMsgMgr); FrameMsgMgr::FrameMsgMgr() diff --git a/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp b/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp index abb445a..06e5abf 100644 --- a/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp +++ b/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp @@ -18,9 +18,6 @@ #include #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "ueaClient-FrameWindowMgr" - namespace OHOS { namespace RME { namespace { @@ -28,6 +25,7 @@ namespace { } IMPLEMENT_SINGLE_INSTANCE(FrameWindowMgr); +DEFINE_RMELOG_INTELLISENSE("ueaClient-FrameWindowMgr"); int FrameWindowMgr::GetEnable() { diff --git a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp index 910f643..43a0566 100644 --- a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp +++ b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp @@ -21,9 +21,6 @@ #include "rtg_interface.h" #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "ueaClient-RmeCoreSched" - namespace OHOS { namespace RME { namespace { @@ -31,6 +28,7 @@ namespace { constexpr int MARGIN_MIDDLE = -5; constexpr int MARGIN_END = -13; } +DEFINE_RMELOG_INTELLISENSE("ueaClient-RmeCoreSched"); RmeCoreSched::RmeCoreSched() {} RmeCoreSched::~RmeCoreSched() diff --git a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp index ce09546..5abca73 100644 --- a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp +++ b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp @@ -30,9 +30,6 @@ #include "rtg_interface.h" #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "ueaServer-IntelliSenseServer" - namespace OHOS { namespace RME { namespace { @@ -45,6 +42,7 @@ namespace { using namespace std; using namespace QosCommon; +DEFINE_RMELOG_INTELLISENSE("ueaServer-IntelliSenseServer"); IMPLEMENT_SINGLE_INSTANCE(IntelliSenseServer); #define CMD_ID_SET_RTG \ diff --git a/frameworks/core/frame_aware_policy/src/para_config.cpp b/frameworks/core/frame_aware_policy/src/para_config.cpp index f6f8064..94cafb9 100644 --- a/frameworks/core/frame_aware_policy/src/para_config.cpp +++ b/frameworks/core/frame_aware_policy/src/para_config.cpp @@ -15,9 +15,6 @@ #include "para_config.h" -#undef LOG_TAG -#define LOG_TAG "ueaServer-ParaConfig" - namespace OHOS { namespace RME { namespace { @@ -25,6 +22,8 @@ namespace { constexpr int RENDER_TYPE_MAX_VALUE = 2; } +DEFINE_RMELOG_INTELLISENSE("ueaServer-ParaConfig"); + std::map ParaConfig::m_generalConfig; std::map> ParaConfig::m_subEventConfig; std::vector ParaConfig::m_fpsList; diff --git a/interfaces/innerkits/frameintf/frame_msg_intf.cpp b/interfaces/innerkits/frameintf/frame_msg_intf.cpp index 714856f..ef1d731 100644 --- a/interfaces/innerkits/frameintf/frame_msg_intf.cpp +++ b/interfaces/innerkits/frameintf/frame_msg_intf.cpp @@ -18,11 +18,9 @@ #include "intellisense_server.h" #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "ueaServer-FrameMsgIntf" - namespace OHOS { namespace RME { +DEFINE_RMELOG_INTELLISENSE("ueaServer-FrameMsgIntf"); FrameMsgIntf& FrameMsgIntf::GetInstance() { diff --git a/interfaces/innerkits/frameintf/frame_ui_intf.cpp b/interfaces/innerkits/frameintf/frame_ui_intf.cpp index 48dff11..ab55306 100644 --- a/interfaces/innerkits/frameintf/frame_ui_intf.cpp +++ b/interfaces/innerkits/frameintf/frame_ui_intf.cpp @@ -20,11 +20,9 @@ #include "frame_msg_mgr.h" #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "ueaClient-FrameUiIntf" - namespace OHOS { namespace RME { +DEFINE_RMELOG_INTELLISENSE("ueaClient-FrameUiIntf"); FrameUiIntf& FrameUiIntf::GetInstance() { diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 53fbdcf..cfbf152 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -25,14 +25,12 @@ #include "bits/ioctl.h" #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "rtg_interface" - namespace OHOS { namespace RME { namespace { constexpr size_t MAX_LENGTH = 100; } +DEFINE_RMELOG_INTELLISENSE("rtg_interface"); const char RTG_SCHED_IPC_MAGIC = 0xAB; static int g_fd = -1; diff --git a/qos_manager/src/qos_common.cpp b/qos_manager/src/qos_common.cpp index 364413d..53a3956 100644 --- a/qos_manager/src/qos_common.cpp +++ b/qos_manager/src/qos_common.cpp @@ -20,14 +20,13 @@ #include #include "rme_log_domain.h" -#undef LOG_TAG -#define LOG_TAG "qos_manager" - constexpr unsigned int AF_QOS_DELEGATED = 0x0001; namespace OHOS { namespace QosCommon { +DEFINE_RMELOG_INTELLISENSE("qos_manager"); + static int TrivalOpenAuthCtrlNode(void) { char fileName[] = "/dev/auth_ctrl"; -- Gitee