Merge pull request #1776 from armink/fix_rtdbg

[rtdbg] Optimize footprint for rtdbg log.
This commit is contained in:
Bernard Xiong 2018-09-11 19:02:54 +08:00 committed by GitHub
commit 1d6fad9d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 18 deletions

View File

@ -54,10 +54,10 @@
#include <rtconfig.h> #include <rtconfig.h>
/* DEBUG level */ /* DEBUG level */
#define DBG_LOG 0 #define DBG_ERROR 0
#define DBG_INFO 1 #define DBG_WARNING 1
#define DBG_WARNING 2 #define DBG_INFO 2
#define DBG_ERROR 3 #define DBG_LOG 3
#ifndef DBG_SECTION_NAME #ifndef DBG_SECTION_NAME
#define DBG_SECTION_NAME "DBG" #define DBG_SECTION_NAME "DBG"
@ -84,17 +84,21 @@
#define _DBG_COLOR(n) rt_kprintf("\033["#n"m") #define _DBG_COLOR(n) rt_kprintf("\033["#n"m")
#define _DBG_LOG_HDR(lvl_name, color_n) \ #define _DBG_LOG_HDR(lvl_name, color_n) \
rt_kprintf("\033["#color_n"m["lvl_name"/"DBG_SECTION_NAME"] ") rt_kprintf("\033["#color_n"m["lvl_name"/"DBG_SECTION_NAME"] ")
#define _DBG_LOG_X_END \
rt_kprintf("\033[0m\n")
#else #else
#define _DBG_COLOR(n) #define _DBG_COLOR(n)
#define _DBG_LOG_HDR(lvl_name, color_n) \ #define _DBG_LOG_HDR(lvl_name, color_n) \
rt_kprintf("["lvl_name"/"DBG_SECTION_NAME"] ") rt_kprintf("["lvl_name"/"DBG_SECTION_NAME"] ")
#define _DBG_LOG_X_END \
rt_kprintf("\n")
#endif /* DBG_COLOR */ #endif /* DBG_COLOR */
/* /*
* static debug routine * static debug routine
*/ */
#define dbg_log(level, fmt, ...) \ #define dbg_log(level, fmt, ...) \
if ((level) >= DBG_LEVEL) \ if ((level) <= DBG_LEVEL) \
{ \ { \
switch(level) \ switch(level) \
{ \ { \
@ -109,13 +113,13 @@
} }
#define dbg_here \ #define dbg_here \
if ((DBG_LEVEL) >= DBG_LOG){ \ if ((DBG_LEVEL) <= DBG_LOG){ \
rt_kprintf(DBG_SECTION_NAME " Here %s:%d\n", \ rt_kprintf(DBG_SECTION_NAME " Here %s:%d\n", \
__FUNCTION__, __LINE__); \ __FUNCTION__, __LINE__); \
} }
#define dbg_enter \ #define dbg_enter \
if ((DBG_LEVEL) >= DBG_LOG){ \ if ((DBG_LEVEL) <= DBG_LOG){ \
_DBG_COLOR(32); \ _DBG_COLOR(32); \
rt_kprintf(DBG_SECTION_NAME " Enter %s\n", \ rt_kprintf(DBG_SECTION_NAME " Enter %s\n", \
__FUNCTION__); \ __FUNCTION__); \
@ -123,18 +127,22 @@
} }
#define dbg_exit \ #define dbg_exit \
if ((DBG_LEVEL) >= DBG_LOG){ \ if ((DBG_LEVEL) <= DBG_LOG){ \
_DBG_COLOR(32); \ _DBG_COLOR(32); \
rt_kprintf(DBG_SECTION_NAME " Exit %s:%d\n", \ rt_kprintf(DBG_SECTION_NAME " Exit %s:%d\n", \
__FUNCTION__); \ __FUNCTION__); \
_DBG_COLOR(0); \ _DBG_COLOR(0); \
} }
#define dbg_log_line(level, ...) \
dbg_log(level, __VA_ARGS__); \ #define dbg_log_line(lvl, color_n, fmt, ...) \
if ((level) >= DBG_LEVEL) { \ do \
rt_kprintf("\n"); \ { \
} _DBG_LOG_HDR(lvl, color_n); \
rt_kprintf(fmt, ##__VA_ARGS__); \
_DBG_LOG_X_END; \
} \
while (0)
#define dbg_raw(...) rt_kprintf(__VA_ARGS__); #define dbg_raw(...) rt_kprintf(__VA_ARGS__);
@ -143,14 +151,34 @@
#define dbg_here #define dbg_here
#define dbg_enter #define dbg_enter
#define dbg_exit #define dbg_exit
#define dbg_log_line(level, ...) #define dbg_log_line(lvl, color_n, fmt, ...)
#define dbg_raw(...) #define dbg_raw(...)
#endif /* DBG_ENABLE */
#if (DBG_LEVEL >= DBG_LOG)
#define LOG_D(fmt, ...) dbg_log_line("D", 0, fmt, ##__VA_ARGS__)
#else
#define LOG_D(...)
#endif
#if (DBG_LEVEL >= DBG_INFO)
#define LOG_I(fmt, ...) dbg_log_line("I", 32, fmt, ##__VA_ARGS__)
#else
#define LOG_I(...)
#endif
#if (DBG_LEVEL >= DBG_WARNING)
#define LOG_W(fmt, ...) dbg_log_line("W", 33, fmt, ##__VA_ARGS__)
#else
#define LOG_W(...)
#endif
#if (DBG_LEVEL >= DBG_ERROR)
#define LOG_E(fmt, ...) dbg_log_line("E", 31, fmt, ##__VA_ARGS__)
#else
#define LOG_E(...)
#endif #endif
#define LOG_D(...) dbg_log_line(DBG_LOG , __VA_ARGS__)
#define LOG_I(...) dbg_log_line(DBG_INFO , __VA_ARGS__)
#define LOG_W(...) dbg_log_line(DBG_WARNING, __VA_ARGS__)
#define LOG_E(...) dbg_log_line(DBG_ERROR , __VA_ARGS__)
#define LOG_RAW(...) dbg_raw(__VA_ARGS__) #define LOG_RAW(...) dbg_raw(__VA_ARGS__)
#endif /* RT_DBG_H__ */ #endif /* RT_DBG_H__ */