Skip to content

Commit 66fe6ec

Browse files
tedhorstgraydon
authored andcommitted
---
yaml --- r: 22681 b: refs/heads/master c: 78fa021 h: refs/heads/master i: 22679: 5b473ac v: v3
1 parent b2bad2c commit 66fe6ec

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 28519c8ef64dc37ceab23d6a26a4ccea7f396a00
2+
refs/heads/master: 78fa02106eefe7526a47808caaee0dbe1857ef2e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/comm.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ fn recv_<T: send>(p: *rust_port) -> T {
211211
}
212212

213213
fn peek_(p: *rust_port) -> bool {
214+
// Yield here before we check to see if someone sent us a message
215+
// FIXME #524, if the compilergenerates yields, we don't need this
216+
task::yield();
214217
rustrt::rust_port_size(p) != 0u as libc::size_t
215218
}
216219

0 commit comments

Comments
 (0)