Skip to content

Fix busy interpreter test readiness race #9328

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
youknowone merged 1 commit into from
Oct 23, 2026
Merged

Fix busy interpreter test readiness race #9328

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
11 changes: 10 additions & 1 deletion crates/vm/src/vm/interpreter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,6 @@ mod tests {
let thread_vm = vm.new_thread();
std::thread::spawn(move || {
thread_vm.run(|vm| {
main_started_worker.store(true, Ordering::Release);
let deadline = Instant::now() + Duration::from_secs(30);
let mut operations = 0;
while !sub_finished_worker.load(Ordering::Acquire) && Instant::now() < deadline
Expand All @@ -1399,6 +1398,11 @@ mod tests {
let result = vm._add(&a, &b).unwrap();
assert_eq!(*int::get_value(&result), 42_i32.to_bigint().unwrap());
operations += 1;
if operations == 1 {
// Publish readiness only after actual progress. Otherwise
// the sub can finish before this loop's first iteration.
main_started_worker.store(true, Ordering::Release);
}
// The protocol calls above never reach a safepoint on
// their own; a bytecode loop would. Without this, a
// concurrent stop-the-world could not finish while this
Expand All @@ -1416,7 +1420,12 @@ mod tests {
let sub_worker = sub.enter(|vm| {
let thread_vm = vm.new_thread();
std::thread::spawn(move || {
let deadline = Instant::now() + Duration::from_secs(30);
while !main_started_worker.load(Ordering::Acquire) {
assert!(
Instant::now() < deadline,
"main interpreter made no progress before the readiness deadline"
);
std::thread::yield_now();
}
thread_vm.run(|vm| {
Expand Down
Loading