Skip to content

async_context_threadsafe_background: fix incorrect mutex assertion in cross-core execute_sync() #2528

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

Merged
merged 6 commits into from
Jun 19, 2025
Merged

async_context_threadsafe_background: fix incorrect mutex assertion in cross-core execute_sync() #2528

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f331a6
async_context_threadsafe_background: fix incorrect mutex assertion in…
schkovich Jun 16, 2025
688b0ef
fix indents
kilograham Jun 16, 2025
dd74e43
Update async_context_threadsafe_background.c
kilograham Jun 16, 2025
c321d22
oops
kilograham Jun 17, 2025
1e6252c
typo
kilograham Jun 17, 2025
519f376
Update async_context_threadsafe_background.c
kilograham Jun 18, 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
9 changes: 7 additions & 2 deletions src/rp2_common/pico_async_context/async_context_threadsafe_background.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,13 @@ static void lock_release(async_context_threadsafe_background_t *self) {
uint32_t async_context_threadsafe_background_execute_sync(async_context_t *self_base, uint32_t (*func)(void *param), void *param) {
async_context_threadsafe_background_t *self = (async_context_threadsafe_background_t*)self_base;
#if ASYNC_CONTEXT_THREADSAFE_BACKGROUND_MULTI_CORE
if (self_base->core_num != get_core_num()) {
hard_assert(!recursive_mutex_enter_count(&self->lock_mutex));
const uint calling_core = get_core_num();
if (self_base->core_num != calling_core) {
// It is ok for the other call to own the mutex currently. Note that this
// read of the owner is not synchronized with the other core; however we only
// care about it being set to `calling_core`, which the other core will not transition
// it either from or to.
hard_assert(recursive_mutex_owner(&self->lock_mutex) != calling_core);
sync_func_call_t call = {0};
call.worker.do_work = handle_sync_func_call;
call.func = func;
Expand Down