From 772a952912a80689ba719a8e53f0a84fd266eb4b Mon Sep 17 00:00:00 2001
From: liuyuxiu <liuyuxiu2@huawei.com>
Date: Thu, 18 Jan 2024 16:27:29 +0800
Subject: [PATCH 1/2] qos_manager HiLog change to HILOG

Signed-off-by: liuyuxiu <liuyuxiu2@huawei.com>
---
 include/concurrent_task_log.h | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/concurrent_task_log.h b/include/concurrent_task_log.h
index 716af45..cf8877c 100644
--- a/include/concurrent_task_log.h
+++ b/include/concurrent_task_log.h
@@ -16,21 +16,20 @@
 #ifndef CONCURRENT_TASK_COMMON_INCLUDE_CONCURRENT_TASK_LOG_H
 #define CONCURRENT_TASK_COMMON_INCLUDE_CONCURRENT_TASK_LOG_H
 
+#undef LOG_DOMAIN
+#define LOG_DOMAIN 0xD001707
+
+#undef LOG_TAG
+#define LOG_TAG "CONCUR"
 #include "hilog/log.h"
 
 namespace OHOS {
 namespace ConcurrentTask {
-constexpr OHOS::HiviewDFX::HiLogLabel CONCUR_LABEL = {
-    LOG_CORE,
-    0xD001707,
-    "CONCUR"
-};
-
-#define CONCUR_LOGF(...) (void)OHOS::HiviewDFX::HiLog::Fatal(CONCUR_LABEL, __VA_ARGS__)
-#define CONCUR_LOGE(...) (void)OHOS::HiviewDFX::HiLog::Error(CONCUR_LABEL, __VA_ARGS__)
-#define CONCUR_LOGW(...) (void)OHOS::HiviewDFX::HiLog::Warn(CONCUR_LABEL, __VA_ARGS__)
-#define CONCUR_LOGI(...) (void)OHOS::HiviewDFX::HiLog::Info(CONCUR_LABEL, __VA_ARGS__)
-#define CONCUR_LOGD(...) (void)OHOS::HiviewDFX::HiLog::Debug(CONCUR_LABEL, __VA_ARGS__)
+#define CONCUR_LOGF(...) (void)HILOG_FATAL(LOG_CORE, __VA_ARGS__)
+#define CONCUR_LOGE(...) (void)HILOG_ERROR(LOG_CORE, __VA_ARGS__)
+#define CONCUR_LOGW(...) (void)HILOG_WARN(LOG_CORE, __VA_ARGS__)
+#define CONCUR_LOGI(...) (void)HILOG_INFO(LOG_CORE, __VA_ARGS__)
+#define CONCUR_LOGD(...) (void)HILOG_DEBUG(LOG_CORE, __VA_ARGS__)
 } // namespace ConcurrentTask
 } // namespace OHOS
 
-- 
Gitee


From b9c302690d665b61338ee8edea50e29af79f3d59 Mon Sep 17 00:00:00 2001
From: liuyuxiu <liuyuxiu2@huawei.com>
Date: Fri, 19 Jan 2024 16:50:12 +0800
Subject: [PATCH 2/2] use HILOG replace to HiLog

Signed-off-by: liuyuxiu <liuyuxiu2@huawei.com>
---
 include/concurrent_task_log.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/concurrent_task_log.h b/include/concurrent_task_log.h
index cf8877c..32fa45c 100644
--- a/include/concurrent_task_log.h
+++ b/include/concurrent_task_log.h
@@ -16,15 +16,17 @@
 #ifndef CONCURRENT_TASK_COMMON_INCLUDE_CONCURRENT_TASK_LOG_H
 #define CONCURRENT_TASK_COMMON_INCLUDE_CONCURRENT_TASK_LOG_H
 
+#include "hilog/log.h"
+
+namespace OHOS {
+namespace ConcurrentTask {
+
 #undef LOG_DOMAIN
 #define LOG_DOMAIN 0xD001707
 
 #undef LOG_TAG
 #define LOG_TAG "CONCUR"
-#include "hilog/log.h"
 
-namespace OHOS {
-namespace ConcurrentTask {
 #define CONCUR_LOGF(...) (void)HILOG_FATAL(LOG_CORE, __VA_ARGS__)
 #define CONCUR_LOGE(...) (void)HILOG_ERROR(LOG_CORE, __VA_ARGS__)
 #define CONCUR_LOGW(...) (void)HILOG_WARN(LOG_CORE, __VA_ARGS__)
-- 
Gitee