michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: shell_log_backend: take buffer size from config

Browse source 
Use LOG_MESSAGE_QUEUE_SIZE config instead of hardcoded value.
LOG_MESSAGE_QUEUE_SIZE default value has been changed to 512, so
it is now matching to the hardcoded value.

Signed-off-by: Wojciech Slenska <wsl@trackunit.com>
This commit is contained in:
Wojciech Slenska 2022-10-28 12:27:15 +02:00 • committed by Stephanos Ioannidis
commit 188d2dfcca
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/zephyr/shell/shell_log_backend.h
View file

@ -72,7 +72,8 @@ int z_shell_log_backend_output_func(uint8_t *data, size_t length, void *ctx);
LOG_OUTPUT_DEFINE(_name##_log_output, z_shell_log_backend_output_func,\ LOG_OUTPUT_DEFINE(_name##_log_output, z_shell_log_backend_output_func,\
_buf, _size); \ _buf, _size); \
static struct shell_log_backend_control_block _name##_control_block; \ static struct shell_log_backend_control_block _name##_control_block; \
static uint32_t __aligned(Z_LOG_MSG2_ALIGNMENT) _name##_buf[128]; \ static uint32_t __aligned(Z_LOG_MSG2_ALIGNMENT) \
_name##_buf[_queue_size / sizeof(uint32_t)]; \
const struct mpsc_pbuf_buffer_config _name##_mpsc_buffer_config = { \ const struct mpsc_pbuf_buffer_config _name##_mpsc_buffer_config = { \
.buf = _name##_buf, \ .buf = _name##_buf, \
.size = ARRAY_SIZE(_name##_buf), \ .size = ARRAY_SIZE(_name##_buf), \

6
subsys/shell/Kconfig.template.shell_log_queue_size
View file

@ -4,8 +4,8 @@ config $(module)_LOG_MESSAGE_QUEUE_SIZE
int "Log message queue size" int "Log message queue size"
default $(default-size) default $(default-size)
help help
Amount of messages that can enqueued in order to be processed by shell Size of buffer for messages that can be enqueued in order to be processed
thread. Too small queue may lead to logger thread being blocked by shell thread. Too small queue may lead to the logger thread being blocked
(see $(module)_LOG_MESSAGE_QUEUE_TIMEOUT). Too big queue on relatively (see $(module)_LOG_MESSAGE_QUEUE_TIMEOUT). Too big queue on relatively
slow shell transport may lead to situation where logs are dropped slow shell transport may lead to situations where logs are dropped
because all log messages are enqueued. because all log messages are enqueued.

2
subsys/shell/backends/Kconfig.backends
View file

@ -82,7 +82,7 @@ module = SHELL_BACKEND_SERIAL
default-timeout = 100 default-timeout = 100
source "subsys/shell/Kconfig.template.shell_log_queue_timeout" source "subsys/shell/Kconfig.template.shell_log_queue_timeout"
default-size = 10 default-size = 512
source "subsys/shell/Kconfig.template.shell_log_queue_size" source "subsys/shell/Kconfig.template.shell_log_queue_size"
choice choice