michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: Add option to have tag which is prepended to all messages

Browse source 
Tag can be changed at runtime. Feature is enabled by setting
maximum tag length to positive value. Additionally, default
tag can be configured in Kconfig.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2021-12-22 15:01:15 +01:00 • committed by Maureen Helm
commit 194c0acdfd
5 changed files with 75 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

37
subsys/logging/log_core.c
View file

@ -109,6 +109,14 @@ static const struct mpsc_pbuf_buffer_config mpsc_config = {
MPSC_PBUF_MODE_OVERWRITE : 0
};
/* Check that default tag can fit in tag buffer. */
COND_CODE_0(CONFIG_LOG_TAG_MAX_LEN, (),
(BUILD_ASSERT(sizeof(CONFIG_LOG_TAG_DEFAULT) <= CONFIG_LOG_TAG_MAX_LEN + 1,
"Default string longer than tag capacity")));
static char tag[CONFIG_LOG_TAG_MAX_LEN + 1] =
COND_CODE_0(CONFIG_LOG_TAG_MAX_LEN, ({}), (CONFIG_LOG_TAG_DEFAULT));
bool log_is_strdup(const void *buf);
static void msg_process(union log_msgs msg, bool bypass);
@ -1215,6 +1223,35 @@ bool z_log_msg2_pending(void)
return mpsc_pbuf_is_pending(&log_buffer);
}
const char *z_log_get_tag(void)
{
return CONFIG_LOG_TAG_MAX_LEN > 0 ? tag : NULL;
}
int log_set_tag(const char *str)
{
if (CONFIG_LOG_TAG_MAX_LEN == 0) {
return -ENOTSUP;
}
if (str == NULL) {
return -EINVAL;
}
size_t len = strlen(str);
size_t cpy_len = MIN(len, CONFIG_LOG_TAG_MAX_LEN);
memcpy(tag, str, cpy_len);
tag[cpy_len] = '\0';
if (cpy_len < len) {
tag[cpy_len - 1] = '~';
return -ENOMEM;
}
return 0;
}
static void log_process_thread_timer_expiry_fn(struct k_timer *timer)
{
k_sem_give(&log_process_thread_sem);