Skip to content

Adjust the recursive run_concurrent check #14302

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

Open
alexcrichton wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −11
Open

Adjust the recursive run_concurrent check #14302

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
18 changes: 7 additions & 11 deletions crates/wasmtime/src/runtime/component/concurrent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,13 @@ impl<T> StoreContextMut<'_, T> {
trap_on_idle: bool,
) -> Result<R> {
debug_assert!(self.0.concurrency_support());
check_recursive_run();
let already_running = self
.0
.concurrent_state_mut_already_forced_current_thread()
.event_loop_running;
if already_running {
bail!("Recursive `StoreContextMut::run_concurrent` calls not supported")
}
let token = StoreToken::new(self.as_context_mut());

struct Dropper<'a, T: 'static, V> {
Expand Down Expand Up @@ -6103,16 +6109,6 @@ fn check_ambient_store(id: StoreId) {
});
}

/// Assert that `StoreContextMut::run_concurrent` has not been called from
/// within an store's event loop.
fn check_recursive_run() {
tls::try_get(|store| {
if !matches!(store, tls::TryGet::None) {
panic!("Recursive `StoreContextMut::run_concurrent` calls not supported")
}
});
}

fn unpack_callback_code(code: u32) -> (u32, u32) {
(code & 0xF, code >> 4)
}
Expand Down
Loading