From 469f9610d36fe2c2e4444e2cd3d15073b46db378 Mon Sep 17 00:00:00 2001 From: zheng-kunfang <1845958389@qq.com> Date: Wed, 6 Aug 2025 09:53:15 +0800 Subject: [PATCH] modif log Signed-off-by: zheng-kunfang <1845958389@qq.com> --- common/log.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/common/log.h b/common/log.h index 360312d..6907077 100644 --- a/common/log.h +++ b/common/log.h @@ -29,11 +29,27 @@ extern "C" { #undef LOG_TAG #define LOG_TAG "NNRt" -#define LOGD(...) HILOG_DEBUG(LOG_CORE, __VA_ARGS__) -#define LOGI(...) HILOG_INFO(LOG_CORE, __VA_ARGS__) -#define LOGW(...) HILOG_WARN(LOG_CORE, __VA_ARGS__) -#define LOGE(...) HILOG_ERROR(LOG_CORE, __VA_ARGS__) -#define LOGF(...) HILOG_FATAL(LOG_CORE, __VA_ARGS__) +#define R_FILENAME (__builtin_strrchr(__FILE_NAME__, '/') ? __builtin_strrchr(__FILE_NAME__, '/') + 1: __FILE_NAME__) + +#define LOGD(fmt, ...) \ + ((void)HILOG_IMPL(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, "[%{public}s(%{public}s:%{public}d)]" fmt, \ + R_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__)) + +#define LOGI(fmt, ...) \ + ((void)HILOG_IMPL(LOG_CORE, LOG_INFO, LOG_DOMAIN, LOG_TAG, "[%{public}s(%{public}s:%{public}d)]" fmt, \ + R_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__)) + +#define LOGW(fmt, ...) \ + ((void)HILOG_IMPL(LOG_CORE, LOG_WARN, LOG_DOMAIN, LOG_TAG, "[%{public}s(%{public}s:%{public}d)]" fmt, \ + R_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__)) + +#define LOGE(fmt, ...) \ + ((void)HILOG_IMPL(LOG_CORE, LOG_ERROR, LOG_DOMAIN, LOG_TAG, "[%{public}s(%{public}s:%{public}d)]" fmt, \ + R_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__)) + +#define LOGF(fmt, ...) \ + ((void)HILOG_IMPL(LOG_CORE, LOG_FATAL, LOG_DOMAIN, LOG_TAG, "[%{public}s(%{public}s:%{public}d)]" fmt, \ + R_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__)) #ifdef __cplusplus } -- Gitee