Skip to content
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

Jump to bottom

Make try_io methods call mio's try_io internally #4582

Merged
merged 3 commits into from Mar 28, 2022
Merged

Make try_io methods call mio's try_io internally #4582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eacd282
tokio: make try_io methods call mio's try_io internally
masa-koz Mar 23, 2022
edf8d99
set minimum mio version to 0.8.1
masa-koz Mar 27, 2022
2ef5217
fix fmt
masa-koz Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tokio/Cargo.toml
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ pin-project-lite = "0.2.0"
bytes = { version = "1.0.0", optional = true }
once_cell = { version = "1.5.2", optional = true }
memchr = { version = "2.2", optional = true }
mio = { version = "0.8.0", optional = true }
mio = { version = "0.8.1", optional = true }
socket2 = { version = "0.4.4", optional = true, features = [ "all" ] }
num_cpus = { version = "1.8.0", optional = true }
parking_lot = { version = "0.12.0", optional = true }
Expand Down
4 changes: 3 additions & 1 deletion tokio/src/net/tcp/stream.rs
View file
Open in desktop
Expand Up @@ -968,7 +968,9 @@ impl TcpStream {
interest: Interest,
f: impl FnOnce() -> io::Result<R>,
) -> io::Result<R> {
self.io.registration().try_io(interest, f)
self.io
.registration()
.try_io(interest, || self.io.try_io(f))
}

/// Receives data on the socket from the remote address to which it is
Expand Down
4 changes: 3 additions & 1 deletion tokio/src/net/udp.rs
View file
Open in desktop
Expand Up @@ -1272,7 +1272,9 @@ impl UdpSocket {
interest: Interest,
f: impl FnOnce() -> io::Result<R>,
) -> io::Result<R> {
self.io.registration().try_io(interest, f)
self.io
.registration()
.try_io(interest, || self.io.try_io(f))
}

/// Receives data from the socket, without removing it from the input queue.
Expand Down
4 changes: 3 additions & 1 deletion tokio/src/net/unix/datagram/socket.rs
View file
Open in desktop
Expand Up @@ -1241,7 +1241,9 @@ impl UnixDatagram {
interest: Interest,
f: impl FnOnce() -> io::Result<R>,
) -> io::Result<R> {
self.io.registration().try_io(interest, f)
self.io
.registration()
.try_io(interest, || self.io.try_io(f))
}

/// Returns the local address that this socket is bound to.
Expand Down
4 changes: 3 additions & 1 deletion tokio/src/net/unix/stream.rs
View file
Open in desktop
Expand Up @@ -685,7 +685,9 @@ impl UnixStream {
interest: Interest,
f: impl FnOnce() -> io::Result<R>,
) -> io::Result<R> {
self.io.registration().try_io(interest, f)
self.io
.registration()
.try_io(interest, || self.io.try_io(f))
}

/// Creates new `UnixStream` from a `std::os::unix::net::UnixStream`.
Expand Down