Fix race condition in CurrentThread. (#156)

The logic that enables `CurrentThread::turn` to avoid unbounded
iteration was incorrect. It was possible for unfortunate timing to
result in a dead lock.

This patch provides a fix as well as a test.
This commit is contained in:
Carl Lerche
2018-02-26 20:41:06 -08:00
committed by GitHub
parent df3a92532b
commit 2961a2388c
3 changed files with 67 additions and 5 deletions
+47 -1
View File
@@ -258,7 +258,7 @@ fn tasks_are_scheduled_fairly() {
}
#[test]
fn spawn_and_tick() {
fn spawn_and_turn() {
let cnt = Rc::new(Cell::new(0));
let c = cnt.clone();
@@ -293,6 +293,52 @@ fn spawn_and_tick() {
assert_eq!(2, cnt.get());
}
#[test]
fn hammer_turn() {
use futures::sync::mpsc;
const ITER: usize = 100;
const N: usize = 100;
const THREADS: usize = 4;
for _ in 0..ITER {
let mut ths = vec![];
// Add some jitter
for _ in 0..THREADS {
let th = thread::spawn(|| {
let mut current_thread = CurrentThread::new();
let (tx, rx) = mpsc::unbounded();
current_thread.spawn({
rx.for_each(|_| {
Ok(())
})
.map_err(|e| panic!("err={:?}", e))
});
thread::spawn(move || {
for _ in 0..N {
tx.unbounded_send(()).unwrap();
thread::yield_now();
}
});
while !current_thread.is_idle() {
current_thread.turn(None).unwrap();
}
});
ths.push(th);
}
for th in ths {
th.join().unwrap();
}
}
}
fn ok() -> future::FutureResult<(), ()> {
future::ok(())
}