Skip to content

[ipv4_tests] remove race condition in the test_receiver_source_limit_2_termination_check test #59

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
stewartadam merged 1 commit into from
Jan 3, 2026
Merged

[ipv4_tests] remove race condition in the test_receiver_source_limit_2_termination_check test #59

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: 1 addition & 1 deletion docker-linux/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ ip a show dev lo
# sysctl -p

cargo test
cargo test --test ipv4_tests -- --ignored --nocapture --test-threads=1
cargo test --test ipv4_tests -- --ignored --test-threads=1
28 changes: 16 additions & 12 deletions tests/ipv4_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern crate uuid;
extern crate socket2;

use std::io::Read;
use std::{thread};
use std::{array, thread};
use std::thread::sleep;
use std::sync::mpsc;
use std::sync::mpsc::{Sender, SyncSender, Receiver, RecvTimeoutError};
Expand Down Expand Up @@ -2256,12 +2256,13 @@ fn test_receiver_source_limit_2_termination_check() {

let mut snd_threads = Vec::new();

let (snd_tx, snd_rx): (SyncSender<()>, Receiver<()>) = mpsc::sync_channel(0); // Used for handshaking, allows syncing the sender states.
let sender_channels: [(SyncSender<()>, Receiver<()>); SND_THREADS] = array::from_fn(|_| mpsc::sync_channel(0));

const BASE_UNIVERSE: u16 = 2;

for i in 0 .. SND_THREADS {
let tx = snd_tx.clone();
// use a unique tx,rx pair per send thread to prevent race condition when using the same tx,rx between threads
let tx = sender_channels[i].0.clone();

let data = [1, 2, 3];

Expand Down Expand Up @@ -2295,14 +2296,16 @@ fn test_receiver_source_limit_2_termination_check() {
dmx_recv.listen_universes(&[i]).unwrap();
}

snd_rx.recv().unwrap();
snd_rx.recv().unwrap();
for (_, snd_rx) in &sender_channels {
snd_rx.recv().unwrap();
}

// Asserts that the recv attempts are successful.
dmx_recv.recv(RECV_TIMEOUT).unwrap();
dmx_recv.recv(RECV_TIMEOUT).unwrap();
dmx_recv.recv(RECV_TIMEOUT).unwrap();
dmx_recv.recv(RECV_TIMEOUT).unwrap();
dmx_recv.recv(RECV_TIMEOUT).expect("dmx_recv.recv() #1 failed.");
dmx_recv.recv(RECV_TIMEOUT).expect("dmx_recv.recv() #2 failed.");
dmx_recv.recv(RECV_TIMEOUT).expect("dmx_recv.recv() #3 failed.");
dmx_recv.recv(RECV_TIMEOUT).expect("dmx_recv.recv() #4 failed.");


// The first source is held back from terminating but the second source should terminate.
let second_thread = snd_threads.remove(1);
Expand All @@ -2318,15 +2321,16 @@ fn test_receiver_source_limit_2_termination_check() {

// New source now sends twice which the receiver should receive.
src.send(&[BASE_UNIVERSE], &data, None, None, None).unwrap();

src.send(&[BASE_UNIVERSE], &data, None, None, None).unwrap();
});

// Asserts that the recv attempts are successful (no source exceeded).
dmx_recv.recv(RECV_TIMEOUT).unwrap();
dmx_recv.recv(RECV_TIMEOUT).unwrap();
dmx_recv.recv(RECV_TIMEOUT).expect("dmx_recv.recv() #5 failed.");
dmx_recv.recv(RECV_TIMEOUT).expect("dmx_recv.recv() #6 failed.");

// Allow the first source to progress and finish.
snd_rx.recv().unwrap();
sender_channels[0].1.recv().unwrap();
let first_thread = snd_threads.remove(0);
first_thread.join().unwrap();

Expand Down