-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
During selection, libnative would erroneously re-acquire ownership of a task when a separate thread still had ownership of the task. The loop in select() was rewritten to acknowledge this race and instead block waiting to re-acquire ownership rather than plowing through. Closes #13494
- Loading branch information
1 parent
4ca7abb
commit 93dc555
Showing
2 changed files
with
76 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// This test may not always fail, but it can be flaky if the race it used to | ||
// expose is still present. | ||
|
||
extern crate green; | ||
extern crate rustuv; | ||
extern crate native; | ||
|
||
#[start] | ||
fn start(argc: int, argv: **u8) -> int { | ||
green::start(argc, argv, rustuv::event_loop, main) | ||
} | ||
|
||
fn helper(rx: Receiver<Sender<()>>) { | ||
for tx in rx.iter() { | ||
let _ = tx.send_opt(()); | ||
} | ||
} | ||
|
||
fn test() { | ||
let (tx, rx) = channel(); | ||
spawn(proc() { helper(rx) }); | ||
let (snd, rcv) = channel(); | ||
for _ in range(1, 100000) { | ||
snd.send(1); | ||
let (tx2, rx2) = channel(); | ||
tx.send(tx2); | ||
select! { | ||
() = rx2.recv() => (), | ||
_ = rcv.recv() => () | ||
} | ||
} | ||
} | ||
|
||
fn main() { | ||
let (tx, rx) = channel(); | ||
spawn(proc() { | ||
tx.send(test()); | ||
}); | ||
rx.recv(); | ||
|
||
let (tx, rx) = channel(); | ||
native::task::spawn(proc() { | ||
tx.send(test()); | ||
}); | ||
rx.recv(); | ||
} |