OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #16894 : alexcrichton/rust/issue-16872, r=huonw

Browse Source 
It was previously asserted that each thread received at least one connection,
but this is not guaranteed to always be the case due to scheduling. This test
also deadlocked on failure due to a lingering reference to the sending half of
the channel, so that reference is now also eagerly dropped so the test can fail
properly if something bad happens.

Closes #16872
This commit is contained in:
bors 2014-08-31 17:15:52 +00:00
commit 08176a3561
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/run-pass/tcp-accept-stress.rs
View File

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-macos #16872 spurious deadlock
#![feature(phase)]
#[phase(plugin)]
@ -49,11 +47,9 @@ fn test() {
let tx = tx.clone();
spawn(proc() {
let mut a = a;
let mut mycnt = 0u;
loop {
match a.accept() {
Ok(..) => {
mycnt += 1;
if cnt.fetch_add(1, atomic::SeqCst) == N * M - 1 {
break
}
@ -62,7 +58,6 @@ fn test() {
Err(e) => fail!("{}", e),
}
}
assert!(mycnt > 0);
tx.send(());
});
}
@ -77,6 +72,7 @@ fn test() {
tx.send(());
});
}
drop(tx);
// wait for senders
assert_eq!(rx.iter().take(N).count(), N);