Skip to content

(feat) Use poll instead of select for tcp connections #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2019
Merged

(feat) Use poll instead of select for tcp connections #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ winapi = "~0.3"

[target.'cfg(unix)'.dependencies]
libc = "0.2"
nix = "0.13"
nix = "0.14.1"
22 changes: 7 additions & 15 deletions src/io/tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ use net2::{TcpBuilder, TcpStreamExt};
#[cfg(unix)]
use nix::{
errno::Errno,
sys::select,
poll::{self, PollFlags},
sys::socket,
sys::time::{TimeVal, TimeValLike},
};
use std::io;
use std::mem;
Expand Down Expand Up @@ -155,29 +154,22 @@ fn connect_fd_timeout(fd: RawFd, sock_addr: &SocketAddr, timeout: Duration) -> i
},
}

let mut fd_set = select::FdSet::new();
let socket_fd = fd;
fd_set.insert(socket_fd);
let mut timeout_timeval = TimeVal::microseconds(timeout.as_secs() as i64 * 1000 * 1000);
let mut poll_fds = [poll::PollFd::new(socket_fd, PollFlags::POLLIN)];
let timeout_millis = timeout.as_secs() as i32 * 1000;

let select_res = select::select(
socket_fd + 1,
None,
Some(&mut fd_set),
None,
Some(&mut timeout_timeval),
);
let poll_res = poll::poll(&mut poll_fds, timeout_millis);

let select_res = select_res.map_err(|err| match err {
let poll_res = poll_res.map_err(|err| match err {
::nix::Error::Sys(errno) => io::Error::from_raw_os_error(errno as i32),
_ => io::Error::new(io::ErrorKind::Other, err),
})?;

if select_res == -1 {
if poll_res == -1 {
return Err(io::Error::last_os_error());
}

if select_res != 1 {
if poll_res != 1 {
return Err(io::ErrorKind::TimedOut.into());
}

Expand Down