michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: Replace custom macros with generic ones from util.h

Browse source 
Some of macros initially created in the logger has been moved
to util.h. This commit replaces custom macros with the one
from util.h

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2019-01-23 13:29:43 +01:00 • committed by Anas Nashif
commit 8cdca11620
3 changed files with 20 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/logging/log.h
View file

@ -285,8 +285,8 @@ char *log_strdup(const char *str);
#else
#define _LOG_LEVEL_RESOLVE(...) \
_LOG_EVAL(LOG_LEVEL, \
(__LOG_ARG_2(__VA_ARGS__, LOG_LEVEL)), \
(__LOG_ARG_2(__VA_ARGS__, CONFIG_LOG_DEFAULT_LEVEL)))
(GET_ARG2(__VA_ARGS__, LOG_LEVEL)), \
(GET_ARG2(__VA_ARGS__, CONFIG_LOG_DEFAULT_LEVEL)))
#endif
/* Return first argument */
@ -355,7 +355,7 @@ char *log_strdup(const char *str);
#define LOG_MODULE_REGISTER(...) \
_LOG_EVAL( \
_LOG_LEVEL_RESOLVE(__VA_ARGS__), \
(_LOG_MODULE_DATA_CREATE(_LOG_ARG1(__VA_ARGS__), \
(_LOG_MODULE_DATA_CREATE(GET_ARG1(__VA_ARGS__), \
_LOG_LEVEL_RESOLVE(__VA_ARGS__))),\
()/*Empty*/ \
) \
@ -389,20 +389,20 @@ char *log_strdup(const char *str);
*/
#define LOG_MODULE_DECLARE(...) \
extern const struct log_source_const_data \
LOG_ITEM_CONST_DATA(_LOG_ARG1(__VA_ARGS__)); \
LOG_ITEM_CONST_DATA(GET_ARG1(__VA_ARGS__)); \
extern struct log_source_dynamic_data \
LOG_ITEM_DYNAMIC_DATA(_LOG_ARG1(__VA_ARGS__)); \
LOG_ITEM_DYNAMIC_DATA(GET_ARG1(__VA_ARGS__)); \
\
static const struct log_source_const_data * \
__log_current_const_data __attribute__((unused)) = \
_LOG_LEVEL_RESOLVE(__VA_ARGS__) ? \
&LOG_ITEM_CONST_DATA(_LOG_ARG1(__VA_ARGS__)) : NULL; \
&LOG_ITEM_CONST_DATA(GET_ARG1(__VA_ARGS__)) : NULL; \
\
static struct log_source_dynamic_data * \
__log_current_dynamic_data __attribute__((unused)) = \
(_LOG_LEVEL_RESOLVE(__VA_ARGS__) && \
IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) ? \
&LOG_ITEM_DYNAMIC_DATA(_LOG_ARG1(__VA_ARGS__)) : NULL;\
&LOG_ITEM_DYNAMIC_DATA(GET_ARG1(__VA_ARGS__)) : NULL; \
\
static const u32_t __log_level __attribute__((unused)) = \
_LOG_LEVEL_RESOLVE(__VA_ARGS__)