From 9192c4de92a4012707bd786e87086591080449af Mon Sep 17 00:00:00 2001 From: chenliming Date: Sun, 10 Aug 2025 21:20:37 +0800 Subject: [PATCH] =?UTF-8?q?description:=E7=B2=BE=E7=AE=80=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenliming --- services/common/include/hilog_tag_wrapper.h | 24 ++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index 5aaa6001aa8..9654ada3d69 100644 --- a/services/common/include/hilog_tag_wrapper.h +++ b/services/common/include/hilog_tag_wrapper.h @@ -25,6 +25,10 @@ #define AAFWK_FUNC_FMT "[%{public}s:%{public}d]" #endif +#ifndef AAFWK_FUNC_FMT_V2 +#define AAFWK_FUNC_FMT_V2 "[%{public}s]" +#endif + #ifndef AAFWK_FILE_NAME #define AAFWK_FILE_NAME \ (__builtin_strrchr(__FILE_NAME__, '/') ? __builtin_strrchr(__FILE_NAME__, '/') + 1 : __FILE_NAME__) @@ -34,6 +38,10 @@ #define AAFWK_FUNC_INFO AAFWK_FILE_NAME, __LINE__ #endif +#ifndef AAFWK_FUNC_INFO_V2 +#define AAFWK_FUNC_INFO AAFWK_FILE_NAME +#endif + namespace OHOS::AAFwk { enum class AAFwkLogTag : uint32_t { @@ -208,19 +216,25 @@ static inline const char* GetTagInfoFromDomainId(AAFwkLogTag tag) default: return "UN"; } } + } // OHOS::AAFwk using AAFwkTag = OHOS::AAFwk::AAFwkLogTag; -#define AAFWK_PRINT_LOG(level, tag, fmt, ...) \ +#define AAFWK_PRINT_LOG(level, tag, flag, fmt, ...) \ do { \ - AAFwkTag logTag = tag; \ - ((void)HILOG_IMPL(LOG_CORE, level, static_cast(logTag), \ - OHOS::AAFwk::GetTagInfoFromDomainId(logTag), AAFWK_FUNC_FMT fmt, AAFWK_FUNC_INFO, ##__VA_ARGS__)); \ + AAFwkTag logTag = tag; + if (flag) { + ((void)HILOG_IMPL(LOG_CORE, level, static_cast(logTag), \ + OHOS::AAFwk::GetTagInfoFromDomainId(logTag), AAFWK_FUNC_FMT_V2 fmt, AAFWK_FUNC_INFO_V2, ##__VA_ARGS__)); \ + } else { + ((void)HILOG_IMPL(LOG_CORE, level, static_cast(logTag), \ + OHOS::AAFwk::GetTagInfoFromDomainId(logTag), AAFWK_FUNC_FMT fmt, AAFWK_FUNC_INFO, ##__VA_ARGS__)); \ + } \ } while (0) #define TAG_LOGD(tag, fmt, ...) AAFWK_PRINT_LOG(LOG_DEBUG, tag, fmt, ##__VA_ARGS__) -#define TAG_LOGI(tag, fmt, ...) AAFWK_PRINT_LOG(LOG_INFO, tag, fmt, ##__VA_ARGS__) +#define TAG_LOGI(tag, flag, fmt, ...) AAFWK_PRINT_LOG(LOG_INFO, tag, flag, fmt, ##__VA_ARGS__) #define TAG_LOGW(tag, fmt, ...) AAFWK_PRINT_LOG(LOG_WARN, tag, fmt, ##__VA_ARGS__) #define TAG_LOGE(tag, fmt, ...) AAFWK_PRINT_LOG(LOG_ERROR, tag, fmt, ##__VA_ARGS__) #define TAG_LOGF(tag, fmt, ...) AAFWK_PRINT_LOG(LOG_FATAL, tag, fmt, ##__VA_ARGS__) -- Gitee