From 1af02b405e99f40bfe76ca7dfb596e6de959106b Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 28 Apr 2019 14:15:15 -0700 Subject: Revert "recover: #1517 Kill all pending accepts when TCP listener is closed (#2224)" (#2239) Crashes while running wrk against js/deps/https/deno.land/std/http/http_bench.ts This reverts commit 972ac03858cc11e8b6bb759ee69640d17235580d. --- cli/tokio_util.rs | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'cli/tokio_util.rs') diff --git a/cli/tokio_util.rs b/cli/tokio_util.rs index a57cbbd2e..e1f8587c3 100644 --- a/cli/tokio_util.rs +++ b/cli/tokio_util.rs @@ -78,31 +78,14 @@ pub fn accept(r: Resource) -> Accept { pub struct Accept { state: AcceptState, } + impl Future for Accept { type Item = (TcpStream, SocketAddr); type Error = io::Error; fn poll(&mut self) -> Poll { let (stream, addr) = match self.state { - // Similar to try_ready!, but also track/untrack accept task - // in TcpListener resource. - // In this way, when the listener is closed, the task can be - // notified to error out (instead of stuck forever). - AcceptState::Pending(ref mut r) => match r.poll_accept() { - Ok(futures::prelude::Async::Ready(t)) => { - r.untrack_task(); - t - } - Ok(futures::prelude::Async::NotReady) => { - // Would error out if another accept task is being tracked. - r.track_task()?; - return Ok(futures::prelude::Async::NotReady); - } - Err(e) => { - r.untrack_task(); - return Err(From::from(e)); - } - }, + AcceptState::Pending(ref mut r) => try_ready!(r.poll_accept()), AcceptState::Empty => panic!("poll Accept after it's done"), }; -- cgit v1.2.3