shell: fix synchronization in log immediate mode
When LOG_MODE_IMMEDIATE is used, logs processed by the shell log backend may be intertwined with messages printed by shell commands running on the shell thread. It is because the shell uses a mutex while the shell log backend uses the IRQ lock for synchronization. Switch the latter to use the mutex as well whenever it's possible. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
This commit is contained in:
parent
1cce353536
commit
fc9f59ce0f
1 changed files with 17 additions and 3 deletions
|
@ -155,7 +155,7 @@ static void process_log_msg(const struct shell *sh,
|
|||
union log_msg_generic *msg,
|
||||
bool locked, bool colors)
|
||||
{
|
||||
unsigned int key;
|
||||
unsigned int key = 0;
|
||||
uint32_t flags = LOG_OUTPUT_FLAG_LEVEL |
|
||||
LOG_OUTPUT_FLAG_TIMESTAMP |
|
||||
LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
|
||||
|
@ -165,7 +165,17 @@ static void process_log_msg(const struct shell *sh,
|
|||
}
|
||||
|
||||
if (locked) {
|
||||
key = irq_lock();
|
||||
/*
|
||||
* If running in the thread context, lock the shell mutex to synchronize with
|
||||
* messages printed on the shell thread. In the ISR context, using a mutex is
|
||||
* forbidden so use the IRQ lock to at least synchronize log messages printed
|
||||
* in different contexts.
|
||||
*/
|
||||
if (k_is_in_isr()) {
|
||||
key = irq_lock();
|
||||
} else {
|
||||
k_mutex_lock(&sh->ctx->wr_mtx, K_FOREVER);
|
||||
}
|
||||
if (!z_flag_cmd_ctx_get(sh)) {
|
||||
z_shell_cmd_line_erase(sh);
|
||||
}
|
||||
|
@ -177,7 +187,11 @@ static void process_log_msg(const struct shell *sh,
|
|||
if (!z_flag_cmd_ctx_get(sh)) {
|
||||
z_shell_print_prompt_and_cmd(sh);
|
||||
}
|
||||
irq_unlock(key);
|
||||
if (k_is_in_isr()) {
|
||||
irq_unlock(key);
|
||||
} else {
|
||||
k_mutex_unlock(&sh->ctx->wr_mtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue