diff options
| author | bors <bors@rust-lang.org> | 2014-01-23 15:36:56 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-23 15:36:56 -0800 |
| commit | 9f4e5b6f3182da3a5dacd9edec2e73b7cd792f25 (patch) | |
| tree | 914192d9447a0e64f08e0b6c9fc5c7d843802938 /src/libnative | |
| parent | 657e3530225410d167d7f1ee827f15bc69cd965e (diff) | |
| parent | be6fb8f2cd5f5c53a2e45dfe1289cf18d40b76e2 (diff) | |
| download | rust-9f4e5b6f3182da3a5dacd9edec2e73b7cd792f25.tar.gz rust-9f4e5b6f3182da3a5dacd9edec2e73b7cd792f25.zip | |
auto merge of #11761 : alexcrichton/rust/epoll-eintr, r=alexcrichton
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/timer_timerfd.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libnative/io/timer_timerfd.rs b/src/libnative/io/timer_timerfd.rs index 4912f4f431f..0556b0c2599 100644 --- a/src/libnative/io/timer_timerfd.rs +++ b/src/libnative/io/timer_timerfd.rs @@ -85,6 +85,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) { events.len() as libc::c_int, -1) } { 0 => fail!("epoll_wait returned immediately!"), + -1 if os::errno() == libc::EINTR as int => { continue } -1 => fail!("epoll wait failed: {}", os::last_os_error()), n => n }; |