From 42f73cb0ecb7975cb0eaa76a4e0f96a949f32846 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Sun, 21 May 2017 11:01:48 -0600 Subject: [PATCH] Revert changes to read_ready and add platform::all() --- src/reactor/mod.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/reactor/mod.rs b/src/reactor/mod.rs index e06b65cc3..9b6523e83 100644 --- a/src/reactor/mod.rs +++ b/src/reactor/mod.rs @@ -469,8 +469,7 @@ impl Inner { mio::Token(TOKEN_START + entry.index() * 2), mio::Ready::readable() | mio::Ready::writable() | - platform::hup() | - platform::aio(), + platform::all(), mio::PollOpt::edge())); Ok((sched.readiness.clone(), entry.insert(sched).index())) } @@ -748,7 +747,7 @@ impl FnBox for F { } fn read_ready() -> mio::Ready { - mio::Ready::readable() | platform::hup() | platform::aio() + mio::Ready::readable() | platform::hup() } const READ: usize = 1 << 0; @@ -788,6 +787,10 @@ mod platform { Ready::empty() } + pub fn all() -> Ready { + hup() + } + pub fn hup() -> Ready { UnixReady::hup().into() } @@ -828,6 +831,10 @@ mod platform { UnixReady::aio().into() } + pub fn all() -> Ready { + hup() | aio() + } + pub fn hup() -> Ready { UnixReady::hup().into() } @@ -874,6 +881,11 @@ mod platform { Ready::empty() } + pub fn all() -> Ready { + // No platform-specific Readinesses for Windows + Ready::empty() + } + pub fn hup() -> Ready { Ready::empty() }