Skip to content

[Backport v3.7-branch] logging: fixes and enhancements to initialization and shell cmds #85159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Backport v3.7-branch] logging: fixes and enhancements to initialization and shell cmds #85159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab9f628
logging: init backend id regardless of autostart
ycsin Jan 31, 2025
2cfbc49
logging: log_cmds: init uninitialized backend on `log_go()`
ycsin Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/zephyr/logging/log_backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct log_backend_control_block {
void *ctx;
uint8_t id;
bool active;
bool initialized;

/* Initialization level. */
uint8_t level;
Expand Down Expand Up @@ -140,6 +141,7 @@ static inline void log_backend_init(const struct log_backend *const backend)
if (backend->api->init) {
backend->api->init(backend);
}
backend->cb->initialized = true;
}

/**
Expand Down
14 changes: 13 additions & 1 deletion subsys/logging/log_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,19 @@ static int log_go(const struct shell *sh,
char **argv)
{
if (backend || !IS_ENABLED(CONFIG_LOG_FRONTEND)) {
log_backend_activate(backend, backend->cb->ctx);
if (!backend->cb->initialized) {
log_backend_init(backend);
while (log_backend_is_ready(backend) != 0) {
if (IS_ENABLED(CONFIG_MULTITHREADING)) {
k_msleep(10);
}
}
if (log_backend_is_ready(backend) == 0) {
log_backend_enable(backend, backend->cb->ctx, CONFIG_LOG_MAX_LEVEL);
}
} else {
log_backend_activate(backend, backend->cb->ctx);
}
return 0;
}

Expand Down
8 changes: 7 additions & 1 deletion subsys/logging/log_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,14 @@ static uint32_t z_log_init(bool blocking, bool can_sleep)

int backend_index = 0;

/* Activate autostart backends */
STRUCT_SECTION_FOREACH(log_backend, backend) {
uint32_t id;
/* As first slot in filtering mask is reserved, backend ID has offset.*/
id = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;
id += backend - log_backend_get(0);
log_backend_id_set(backend, id);

/* Activate autostart backends */
if (backend->autostart) {
log_backend_init(backend);

Expand Down
6 changes: 0 additions & 6 deletions subsys/logging/log_mgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,6 @@ void log_backend_enable(struct log_backend const *const backend,
void *ctx,
uint32_t level)
{
/* As first slot in filtering mask is reserved, backend ID has offset.*/
uint32_t id = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;

id += backend - log_backend_get(0);

log_backend_id_set(backend, id);
backend->cb->level = level;
backend_filter_set(backend, level);
log_backend_activate(backend, ctx);
Expand Down
Loading