itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-10-01 12:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp: Express incoming in terms of accept

Browse Source
This commit is contained in:
Dawid Ciężarkiewicz 2016-12-16 11:07:08 -08:00
parent 936727fa52
commit 1864ecc46f
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/net/tcp.rs
View File

@ -145,38 +145,17 @@ impl TcpListener {
} }
impl Stream for MyIncoming { impl Stream for MyIncoming {
type Item = (mio::tcp::TcpStream, SocketAddr); type Item = (TcpStream, SocketAddr);
type Error = io::Error; type Error = io::Error;
fn poll(&mut self) -> Poll<Option<Self::Item>, io::Error> { fn poll(&mut self) -> Poll<Option<Self::Item>, io::Error> {
if let Async::NotReady = self.inner.io.poll_read() { Ok(Async::Ready(Some(try_nb!(self.inner.accept()))))
return Ok(Async::NotReady)
}
match self.inner.io.get_ref().accept() {
Ok(pair) => Ok(Async::Ready(Some(pair))),
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
self.inner.io.need_read();
Ok(Async::NotReady)
}
Err(e) => Err(e)
}
} }
} }
let remote = self.io.remote().clone();
let stream = MyIncoming { inner: self }; let stream = MyIncoming { inner: self };
Incoming { Incoming {
inner: stream.and_then(move |(tcp, addr)| { inner: stream.boxed(),
let (tx, rx) = futures::oneshot();
remote.spawn(move |handle| {
let res = PollEvented::new(tcp, handle).map(move |io| {
(TcpStream { io: io }, addr)
});
tx.complete(res);
Ok(())
});
rx.then(|r| r.expect("shouldn't be canceled"))
}).boxed(),
} }
} }