Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 21:15:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #156365 - RalfJung:stream_send_recv_stress, r=nia-e

Browse Source 
stream_send_recv_stress tests: wait for threads to finish

These tests currently fail in Miri (when run with nextest) because all they do is spawn a lot of threads that will do stuff, but they don't wait for the threads to actually finish. Miri by default errors when there are background threads lingering when `main` is done (since that can indicate a leak, and since it makes it impossible to check for memory leaks). Miri gives background threads a bit of time to finish when `main` is done, but for these tests that's nowhere near enough since basically the entire test runs after `main` is done.

Outside Miri, this could also still mean that the test doesn't actually run to completion, it might get abort when `main` finishes.

So let's use `thread::scope` to ensure all threads are done before the test is considered done.
This commit is contained in:
Jonathan Brouwer
2026-05-10 19:05:47 +02:00
committed by GitHub
parent 06ccbc1929 773af23505
commit 4d2f9ca08d
2 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/std/tests/sync/mpmc.rs
+35 -21
View File
@@ -419,34 +419,48 @@ fn oneshot_multi_thread_send_recv_stress() {
#[test]
fn stream_send_recv_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel();
thread::scope(|s| {
for _ in 0..stress_factor() {
let (tx, rx) = channel();
send(tx, 0);
recv(rx, 0);
send(tx, 0, s);
recv(rx, 0, s);
fn send(tx: Sender<Box<i32>>, i: i32) {
if i == 10 {
return;
fn send<'scope, 'env>(
tx: Sender<Box<i32>>,
i: i32,
s: &'scope thread::Scope<'scope, 'env>,
) where
'env: 'scope,
{
if i == 10 {
return;
}
s.spawn(move || {
tx.send(Box::new(i)).unwrap();
send(tx, i + 1, s);
});
}
thread::spawn(move || {
tx.send(Box::new(i)).unwrap();
send(tx, i + 1);
});
}
fn recv<'scope, 'env>(
rx: Receiver<Box<i32>>,
i: i32,
s: &'scope thread::Scope<'scope, 'env>,
) where
'env: 'scope,
{
if i == 10 {
return;
}
fn recv(rx: Receiver<Box<i32>>, i: i32) {
if i == 10 {
return;
s.spawn(move || {
assert!(*rx.recv().unwrap() == i);
recv(rx, i + 1, s);
});
}
thread::spawn(move || {
assert!(*rx.recv().unwrap() == i);
recv(rx, i + 1);
});
}
}
})
}
#[test]
library/std/tests/sync/mpsc.rs
+35 -21
View File
@@ -382,34 +382,48 @@ fn oneshot_multi_thread_send_recv_stress() {
#[test]
fn stream_send_recv_stress() {
for _ in 0..stress_factor() {
let (tx, rx) = channel();
thread::scope(|s| {
for _ in 0..stress_factor() {
let (tx, rx) = channel();
send(tx, 0);
recv(rx, 0);
send(tx, 0, s);
recv(rx, 0, s);
fn send(tx: Sender<Box<i32>>, i: i32) {
if i == 10 {
return;
fn send<'scope, 'env>(
tx: Sender<Box<i32>>,
i: i32,
s: &'scope thread::Scope<'scope, 'env>,
) where
'env: 'scope,
{
if i == 10 {
return;
}
s.spawn(move || {
tx.send(Box::new(i)).unwrap();
send(tx, i + 1, s);
});
}
thread::spawn(move || {
tx.send(Box::new(i)).unwrap();
send(tx, i + 1);
});
}
fn recv<'scope, 'env>(
rx: Receiver<Box<i32>>,
i: i32,
s: &'scope thread::Scope<'scope, 'env>,
) where
'env: 'scope,
{
if i == 10 {
return;
}
fn recv(rx: Receiver<Box<i32>>, i: i32) {
if i == 10 {
return;
s.spawn(move || {
assert!(*rx.recv().unwrap() == i);
recv(rx, i + 1, s);
});
}
thread::spawn(move || {
assert!(*rx.recv().unwrap() == i);
recv(rx, i + 1);
});
}
}
})
}
#[test]