lby/mr-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(log): Fix the log filtering anomaly.

Browse Source 
1.Fixed the issue of static filtering failure caused by the enumeration taking effect at compile time, and optimized the problem of poor black display effect of TRACE.
This commit is contained in:
MacRsh
2025-08-26 00:21:58 +08:00
parent c2bc6acd16
commit 8ef79c2641
5 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mr-X/Kconfig
View File

@@ -60,7 +60,7 @@ config MR_USE_LOG
config MR_CFG_LOG_LEVEL
depends on MR_USE_LOG
int "Log level"
int "Log level(0:ERR, 1:WRN, 2:INF, 3:DBG, 4:TRC)"
default 4
range 0 4

68
include/mr-X/mr_log.h
View File

@@ -11,7 +11,7 @@
#include <mr_config.h>
#if defined(MR_USE_LOG)
#include <libc/mr_types.h>
#include <mr-X/mr_printf.h>
#endif /* defined(MR_USE_LOG) */
#ifdef __cplusplus
@@ -25,20 +25,18 @@ extern "C" {
#if defined(MR_USE_LOG)
/* Log level definition */
enum mr_log_level {
MR_LOG_LEVEL_ERROR,
MR_LOG_LEVEL_WARN,
MR_LOG_LEVEL_INFO,
MR_LOG_LEVEL_DEBUG,
MR_LOG_LEVEL_TRACE,
};
#define MR_LOG_LEVEL_ERR (0)
#define MR_LOG_LEVEL_WRN (1)
#define MR_LOG_LEVEL_INF (2)
#define MR_LOG_LEVEL_DBG (3)
#define MR_LOG_LEVEL_TRC (4)
/* Log level mask definition */
#define MR_LOG_MASK(_level) (1U << _level)
/* Log default level definition */
#if !defined(MR_CFG_LOG_LEVEL)
#define MR_CFG_LOG_LEVEL MR_LOG_LEVEL_TRACE
#define MR_CFG_LOG_LEVEL MR_LOG_LEVEL_TRC
#endif /* !defined(MR_CFG_LOG_LEVEL) */
/**
@@ -66,44 +64,44 @@ mr_uint32_t mr_log_mask(void);
/* Log format macro definition */
#define __MR_LOG_FORMAT(_color, _level, _fmt) \
(_color " [" _level "/" MR_LOG_TAG "] " _fmt MR_COLOR_RESET "\n")
(MR_COLOR(_color, "[" _level "/" MR_LOG_TAG "] " _fmt) "\n")
/* Log macro definition */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_TRACE)
#define MR_LOG_TRACE(_fmt, ...) \
mr_log(MR_LOG_LEVEL_TRACE, __MR_LOG_FORMAT(MR_COLOR_BLACK, "TRC", _fmt), \
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_TRC)
#define MR_LOG_TRC(_fmt, ...) \
mr_log(MR_LOG_LEVEL_TRC, __MR_LOG_FORMAT(MR_COLOR_WHITE, "TRC", _fmt), \
##__VA_ARGS__)
#else
#define MR_LOG_TRACE(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_TRACE) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_DEBUG)
#define MR_LOG_DEBUG(_fmt, ...) \
mr_log(MR_LOG_LEVEL_DEBUG, __MR_LOG_FORMAT(MR_COLOR_BLUE, "DBG", _fmt), \
#define MR_LOG_TRC(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_TRC) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_DBG)
#define MR_LOG_DBG(_fmt, ...) \
mr_log(MR_LOG_LEVEL_DBG, __MR_LOG_FORMAT(MR_COLOR_BLUE, "DBG", _fmt), \
##__VA_ARGS__)
#else
#define MR_LOG_DEBUG(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_DEBUG) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_INFO)
#define MR_LOG_INFO(_fmt, ...) \
mr_log(MR_LOG_LEVEL_INFO, __MR_LOG_FORMAT(MR_COLOR_GREEN, "INF", _fmt), \
#define MR_LOG_DBG(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_DBG) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_INF)
#define MR_LOG_INF(_fmt, ...) \
mr_log(MR_LOG_LEVEL_INF, __MR_LOG_FORMAT(MR_COLOR_GREEN, "INF", _fmt), \
##__VA_ARGS__)
#else
#define MR_LOG_INFO(_fmt, ...) ((void)0)
#endif /* (MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_INFO) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_WARN)
#define MR_LOG_WARN(_fmt, ...) \
mr_log(MR_LOG_LEVEL_WARN, __MR_LOG_FORMAT(MR_COLOR_YELLOW, "WRN", _fmt), \
#define MR_LOG_INF(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_INF) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_WRN)
#define MR_LOG_WRN(_fmt, ...) \
mr_log(MR_LOG_LEVEL_WRN, __MR_LOG_FORMAT(MR_COLOR_YELLOW, "WRN", _fmt), \
##__VA_ARGS__)
#else
#define MR_LOG_WARN(_fmt, ...) ((void)0)
#endif /* (MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_WARN) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_ERROR)
#define MR_LOG_ERROR(_fmt, ...) \
mr_log(MR_LOG_LEVEL_ERROR, __MR_LOG_FORMAT(MR_COLOR_RED, "ERR", _fmt), \
#define MR_LOG_WRN(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_WRN) */
#if defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_ERR)
#define MR_LOG_ERR(_fmt, ...) \
mr_log(MR_LOG_LEVEL_ERR, __MR_LOG_FORMAT(MR_COLOR_RED, "ERR", _fmt), \
##__VA_ARGS__)
#else
#define MR_LOG_ERROR(_fmt, ...) ((void)0)
#endif /* (MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_ERROR) */
#define MR_LOG_ERR(_fmt, ...) ((void)0)
#endif /* defined(MR_LOG_TAG) && (MR_CFG_LOG_LEVEL >= MR_LOG_LEVEL_ERR) */
#endif /* defined(MR_USE_LOG) */
/** @} */

6
include/mr-X/mr_printf.h
View File

@@ -33,6 +33,9 @@ extern "C" {
#define MR_COLOR_GREEN "\033[32m"
#define MR_COLOR_YELLOW "\033[33m"
#define MR_COLOR_BLUE "\033[34m"
#define MR_COLOR_MAGENTA "\033[35m"
#define MR_COLOR_CYAN "\033[36m"
#define MR_COLOR_WHITE "\033[37m"
#define MR_COLOR(_color, _str) _color _str MR_COLOR_RESET
#else
#define MR_COLOR_RESET
@@ -41,6 +44,9 @@ extern "C" {
#define MR_COLOR_GREEN
#define MR_COLOR_YELLOW
#define MR_COLOR_BLUE
#define MR_COLOR_MAGENTA
#define MR_COLOR_CYAN
#define MR_COLOR_WHITE
#define MR_COLOR(_color, _str) _str
#endif /* defined(MR_USE_PRINTF_COLOR) */

1
kernel/log.c
View File

@@ -8,7 +8,6 @@
#include <mr-X/mr_log.h>
#if defined(MR_USE_LOG)
#include <mr-X/mr_printf.h>
/* Log level mask */
static mr_uint32_t __level = 0xffffffffU;

5
kernel/printf.c
View File

@@ -60,11 +60,6 @@ int mr_printf(const char *fmt, ...) {
mr_va_list args;
int ret;
/* Check parameter */
if ((!fmt) || (fmt[0] == '\0')) {
return -MR_EINVAL;
}
/* Print */
mr_va_start(args, fmt);
ret = mr_vprintf(fmt, args);