michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: Fix static log filtering

Browse source 
LOG_MODULE_REGISTER() was missing setting compiled-in log level
which was evaluated when message was filtered if runtime filtering
was disabled. As the outcome logs were not printed when runtime
filtering was disabled.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2018-07-20 14:25:57 +02:00 • committed by Anas Nashif
commit 7fe2c3b14f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/logging/log.h
View file

@ -259,14 +259,15 @@ int log_printk(const char *fmt, va_list ap);
_LOG_EVAL( \ _LOG_EVAL( \
CONFIG_LOG_RUNTIME_FILTERING, \ CONFIG_LOG_RUNTIME_FILTERING, \
(; __DYNAMIC_MODULE_REGISTER(_name)), \ (; __DYNAMIC_MODULE_REGISTER(_name)), \
()\ () \
) )
#define _LOG_MODULE_REGISTER(_name, level) \ #define _LOG_MODULE_REGISTER(_name, _level) \
const struct log_source_const_data LOG_ITEM_CONST_DATA(_name) \ const struct log_source_const_data LOG_ITEM_CONST_DATA(_name) \
__attribute__ ((section("." STRINGIFY(LOG_ITEM_CONST_DATA(_name))))) \ __attribute__ ((section("." STRINGIFY(LOG_ITEM_CONST_DATA(_name))))) \
__attribute__((used)) = { \ __attribute__((used)) = { \
.name = STRINGIFY(_name) \ .name = STRINGIFY(_name), \
.level = _level \
} \ } \
_LOG_RUNTIME_MODULE_REGISTER(_name) _LOG_RUNTIME_MODULE_REGISTER(_name)

2
include/logging/log_core.h
View file

@ -39,7 +39,7 @@ extern "C" {
#define __LOG_RESOLVED_LEVEL2(one_or_two_args, _level, _default) \ #define __LOG_RESOLVED_LEVEL2(one_or_two_args, _level, _default) \
__LOG_ARG_2(one_or_two_args _level, _default) __LOG_ARG_2(one_or_two_args _level, _default)
#define LOG_DEBRACKET(x) x #define LOG_DEBRACKET(...) __VA_ARGS__
#define __LOG_ARG_2(ignore_this, val, ...) val #define __LOG_ARG_2(ignore_this, val, ...) val
#define __LOG_ARG_2_DEBRACKET(ignore_this, val, ...) LOG_DEBRACKET val #define __LOG_ARG_2_DEBRACKET(ignore_this, val, ...) LOG_DEBRACKET val