Skip to content
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

logging: rpc: disable overwriting while history transfer #19859

Merged
merged 1 commit into from
Jan 17, 2025
Merged

logging: rpc: disable overwriting while history transfer #19859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 subsys/logging/log_backend_rpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ static void history_transfer_task(struct k_work *work)
} else {
log_rpc_history_free(history_cur_msg);
history_cur_msg = NULL;
log_rpc_history_set_overwriting(true);
}

k_mutex_unlock(&history_transfer_mtx);
Expand All @@ -541,6 +542,7 @@ static void log_rpc_fetch_history_handler(const struct nrf_rpc_group *group,

k_mutex_lock(&history_transfer_mtx, K_FOREVER);
history_transfer_id = transfer_id;
log_rpc_history_set_overwriting(false);
k_work_submit_to_queue(&history_transfer_workq, &history_transfer_work);
k_mutex_unlock(&history_transfer_mtx);

Expand Down
1 change: 1 addition & 0 deletions subsys/logging/log_backend_rpc_history.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
void log_rpc_history_init(void);

void log_rpc_history_push(const union log_msg_generic *msg);
void log_rpc_history_set_overwriting(bool overwriting);

union log_msg_generic *log_rpc_history_pop(void);
void log_rpc_history_free(const union log_msg_generic *msg);
Expand Down
13 changes: 13 additions & 0 deletions subsys/logging/log_backend_rpc_history_ram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ void log_rpc_history_push(const union log_msg_generic *msg)
mpsc_pbuf_commit(&log_history_pbuf, &copy->buf);
}

void log_rpc_history_set_overwriting(bool overwriting)
{
k_sched_lock();

if (overwriting) {
log_history_pbuf.flags |= MPSC_PBUF_MODE_OVERWRITE;
} else {
log_history_pbuf.flags &= (~MPSC_PBUF_MODE_OVERWRITE);
}

k_sched_unlock();
}

union log_msg_generic *log_rpc_history_pop(void)
{
return (union log_msg_generic *)mpsc_pbuf_claim(&log_history_pbuf);
Expand Down