!148 DDL日志轻量化整改

Merge pull request !148 from mengyiping/master

common/include/rme_log_domain.h

@@ -16,12 +16,14 @@
 #ifndef RME_LOG_DOMAIN_H
 #define RME_LOG_DOMAIN_H
 
+#undef LOG_DOMAIN
+#define LOG_DOMAIN 0xD001706
+
 #include <cstdint>
 #include "hilog/log.h"
 
 namespace OHOS {
 namespace RmeLogDomain {
-constexpr uint32_t RME_INTELLISENSE = 0xD001706;
 
 /*
 #ifdef RME_LOGF
@@ -45,14 +47,11 @@ constexpr uint32_t RME_INTELLISENSE = 0xD001706;
 #endif
 */
 
-#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__)
+#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__)
 } // namespace RmeLogDomain
 } // namespace OHOS
 #endif // RME_LOG_DOMAIN_H

frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp

@@ -19,9 +19,11 @@
 #include <utility>
 #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()

frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp

@@ -18,6 +18,9 @@
 #include <string>
 #include "rme_log_domain.h"
 
+#undef LOG_TAG
+#define LOG_TAG "ueaClient-FrameWindowMgr"
+
 namespace OHOS {
 namespace RME {
 namespace {
@@ -25,7 +28,6 @@ namespace {
 }
 
 IMPLEMENT_SINGLE_INSTANCE(FrameWindowMgr);
-DEFINE_RMELOG_INTELLISENSE("ueaClient-FrameWindowMgr");
 
 int FrameWindowMgr::GetEnable()
 {

frameworks/core/frame_aware_collector/src/rme_core_sched.cpp

@@ -21,6 +21,9 @@
 #include "rtg_interface.h"
 #include "rme_log_domain.h"
 
+#undef LOG_TAG
+#define LOG_TAG "ueaClient-RmeCoreSched"
+
 namespace OHOS {
 namespace RME {
 namespace {
@@ -28,7 +31,6 @@ namespace {
     constexpr int MARGIN_MIDDLE = -5;
     constexpr int MARGIN_END = -13;
 }
-DEFINE_RMELOG_INTELLISENSE("ueaClient-RmeCoreSched");
 RmeCoreSched::RmeCoreSched() {}
 
 RmeCoreSched::~RmeCoreSched()

frameworks/core/frame_aware_policy/src/intellisense_server.cpp

@@ -30,6 +30,9 @@
 #include "rtg_interface.h"
 #include "rme_log_domain.h"
 
+#undef LOG_TAG
+#define LOG_TAG "ueaServer-IntelliSenseServer"
+
 namespace OHOS {
 namespace RME {
 namespace {
@@ -42,7 +45,6 @@ namespace {
 using namespace std;
 using namespace QosCommon;
 
-DEFINE_RMELOG_INTELLISENSE("ueaServer-IntelliSenseServer");
 IMPLEMENT_SINGLE_INSTANCE(IntelliSenseServer);
 
 #define CMD_ID_SET_RTG \

frameworks/core/frame_aware_policy/src/para_config.cpp

@@ -15,6 +15,9 @@
 
 #include "para_config.h"
 
+#undef LOG_TAG
+#define LOG_TAG "ueaServer-ParaConfig"
+
 namespace OHOS {
 namespace RME {
 namespace {
@@ -22,8 +25,6 @@ namespace {
     constexpr int RENDER_TYPE_MAX_VALUE = 2;
 }
 
-DEFINE_RMELOG_INTELLISENSE("ueaServer-ParaConfig");
-
 std::map<std::string, std::string> ParaConfig::m_generalConfig;
 std::map<std::string, std::map<std::string, int>> ParaConfig::m_subEventConfig;
 std::vector<int> ParaConfig::m_fpsList;

interfaces/innerkits/frameintf/frame_msg_intf.cpp

@@ -18,9 +18,11 @@
 #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()
 {

interfaces/innerkits/frameintf/frame_ui_intf.cpp

@@ -20,9 +20,11 @@
 #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()
 {

interfaces/innerkits/frameintf/rtg_interface.cpp

@@ -25,12 +25,14 @@
 #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;

qos_manager/src/qos_common.cpp

@@ -20,13 +20,14 @@
 #include <fcntl.h>
 #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";