buffer: add pipeline and component ids to buf_foo() output for Zephyr

The component and pipeline identifiers were direct part of the older
SOF dictionary format. This information was added directly to encoded
output and was not part of the log message. When using Zephyr logging
subsystem, this type of audio specific information has be to put
as part of the log messages like any other log content.

Modify buf_{err,warn,info,dbg} macros to add buffer pipeline
and buffer-id identifiers to all printed log messages.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2022-10-10 16:44:45 +03:00 committed by Kai Vehmanen
parent cef9544f06
commit bae8457c78
1 changed files with 14 additions and 4 deletions

View File

@ -51,13 +51,23 @@ extern struct tr_ctx buffer_tr;
#if defined(__ZEPHYR__) && defined(CONFIG_ZEPHYR_LOG)
#define buf_err(buf_ptr, __e, ...) LOG_ERR(__e, ##__VA_ARGS__)
#if CONFIG_IPC_MAJOR_4
#define __BUF_FMT "buf:%u %#x "
#else
#define __BUF_FMT "buf:%u.%u "
#endif
#define buf_warn(buf_ptr, __e, ...) LOG_WRN(__e, ##__VA_ARGS__)
#define buf_err(buf_ptr, __e, ...) LOG_ERR(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
trace_buf_get_subid(buf_ptr), ##__VA_ARGS__)
#define buf_info(buf_ptr, __e, ...) LOG_INF(__e, ##__VA_ARGS__)
#define buf_warn(buf_ptr, __e, ...) LOG_WRN(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
trace_buf_get_subid(buf_ptr), ##__VA_ARGS__)
#define buf_dbg(buf_ptr, __e, ...) LOG_DBG(__e, ##__VA_ARGS__)
#define buf_info(buf_ptr, __e, ...) LOG_INF(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
trace_buf_get_subid(buf_ptr), ##__VA_ARGS__)
#define buf_dbg(buf_ptr, __e, ...) LOG_DBG(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
trace_buf_get_subid(buf_ptr), ##__VA_ARGS__)
#else
/** \brief Trace error message from buffer */