Support ESP-IDF without flags

Updates #1703

Author: Thomasdezeeuw

Diff for: src/poll.rs

@@ -1,7 +1,7 @@
 #[cfg(all(
     unix,
     not(mio_unsupported_force_poll_poll),
-    not(any(target_os = "solaris", target_os = "vita"))
+    not(any(target_os = "espidf", target_os = "solaris", target_os = "vita")),
 ))]
 use std::os::unix::io::{AsRawFd, RawFd};
 #[cfg(all(debug_assertions, not(target_os = "wasi")))]
@@ -430,7 +430,7 @@ impl Poll {
 #[cfg(all(
     unix,
     not(mio_unsupported_force_poll_poll),
-    not(any(target_os = "solaris", target_os = "vita"))
+    not(any(target_os = "espidf", target_os = "solaris", target_os = "vita")),
 ))]
 impl AsRawFd for Poll {
     fn as_raw_fd(&self) -> RawFd {
@@ -721,7 +721,7 @@ impl fmt::Debug for Registry {
 #[cfg(all(
     unix,
     not(mio_unsupported_force_poll_poll),
-    not(any(target_os = "solaris", target_os = "vita"))
+    not(any(target_os = "espidf", target_os = "solaris", target_os = "vita")),
 ))]
 impl AsRawFd for Registry {
     fn as_raw_fd(&self) -> RawFd {
@@ -733,7 +733,7 @@ cfg_os_poll! {
     #[cfg(all(
         unix,
         not(mio_unsupported_force_poll_poll),
-        not(any(target_os = "solaris", target_os = "vita")),
+        not(any(target_os = "espidf", target_os = "solaris", target_os = "vita")),
     ))]
     #[test]
     pub fn as_raw_fd() {

Diff for: src/sys/unix/mod.rs

@@ -37,7 +37,7 @@ cfg_os_poll! {
 
     cfg_io_source! {
         // Both `kqueue` and `epoll` don't need to hold any user space state.
-        #[cfg(not(any(mio_unsupported_force_poll_poll, target_os = "hermit", target_os = "solaris", target_os = "vita")))]
+        #[cfg(not(any(mio_unsupported_force_poll_poll, target_os = "espidf", target_os = "hermit", target_os = "solaris", target_os = "vita")))]
         mod stateless_io_source {
             use std::io;
             #[cfg(target_os = "hermit")]
@@ -93,10 +93,10 @@ cfg_os_poll! {
             }
         }
 
-        #[cfg(not(any(mio_unsupported_force_poll_poll, target_os = "hermit", target_os = "solaris",target_os = "vita")))]
+        #[cfg(not(any(mio_unsupported_force_poll_poll, target_os = "espidf", target_os = "hermit", target_os = "solaris", target_os = "vita")))]
         pub(crate) use self::stateless_io_source::IoSourceState;
 
-        #[cfg(any(mio_unsupported_force_poll_poll, target_os = "hermit", target_os = "solaris", target_os = "vita"))]
+        #[cfg(any(mio_unsupported_force_poll_poll, target_os = "espidf", target_os = "hermit", target_os = "solaris", target_os = "vita"))]
         pub(crate) use self::selector::IoSourceState;
     }
 

Diff for: src/sys/unix/selector/mod.rs

@@ -22,22 +22,30 @@ pub(crate) use self::epoll::{event, Event, Events, Selector};
 
 #[cfg(any(
     mio_unsupported_force_poll_poll,
+    target_os = "espidf",
+    target_os = "hermit",
     target_os = "solaris",
     target_os = "vita",
-    target_os = "hermit"
 ))]
 mod poll;
 
 #[cfg(any(
     mio_unsupported_force_poll_poll,
+    target_os = "espidf",
+    target_os = "hermit",
     target_os = "solaris",
     target_os = "vita",
-    target_os = "hermit"
 ))]
 pub(crate) use self::poll::{event, Event, Events, Selector};
 
 cfg_io_source! {
-    #[cfg(any(mio_unsupported_force_poll_poll, target_os = "hermit", target_os = "solaris", target_os = "vita"))]
+    #[cfg(any(
+        mio_unsupported_force_poll_poll,
+        target_os = "espidf",
+        target_os = "hermit",
+        target_os = "solaris",
+        target_os = "vita",
+    ))]
     pub(crate) use self::poll::IoSourceState;
 }
 

Diff for: src/sys/unix/selector/poll.rs

@@ -3,21 +3,21 @@
 // Permission to use this code has been granted by original author:
 // https://github.com/tokio-rs/mio/pull/1602#issuecomment-1218441031
 
-use crate::sys::unix::selector::LOWEST_FD;
-use crate::sys::unix::waker::WakerInternal;
-use crate::{Interest, Token};
 use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 #[cfg(target_os = "hermit")]
 use std::os::hermit::io::{AsRawFd, RawFd};
 #[cfg(unix)]
 use std::os::unix::io::{AsRawFd, RawFd};
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{Arc, Condvar, Mutex};
 use std::time::Duration;
 use std::{cmp, fmt, io};
 
+use crate::sys::unix::selector::LOWEST_FD;
+use crate::sys::unix::waker::WakerInternal;
+use crate::{Interest, Token};
+
 /// Unique id for use as `SelectorId`.
 #[cfg(debug_assertions)]
 static NEXT_ID: AtomicUsize = AtomicUsize::new(1);
@@ -74,6 +74,7 @@ impl Selector {
     pub fn wake(&self, token: Token) -> io::Result<()> {
         self.state.wake(token)
     }
+
     cfg_io_source! {
         #[cfg(debug_assertions)]
         pub fn id(&self) -> usize {

Diff for: src/sys/unix/waker.rs

@@ -10,7 +10,7 @@
             target_os = "watchos",
         )
     )),
-    not(any(target_os = "solaris", target_os = "vita", target_os = "hermit")),
+    not(any(target_os = "espidf", target_os = "hermit", target_os = "solaris", target_os = "vita")),
 ))]
 mod fdbased {
     #[cfg(all(
@@ -63,17 +63,17 @@ mod fdbased {
             target_os = "watchos",
         )
     )),
-    not(any(target_os = "solaris", target_os = "vita", target_os = "hermit")),
+    not(any(target_os = "espidf", target_os = "hermit", target_os = "solaris", target_os = "vita")),
 ))]
 pub use self::fdbased::Waker;
 
 #[cfg(all(
     not(mio_unsupported_force_waker_pipe),
     any(
-        target_os = "linux",
         target_os = "android",
         target_os = "espidf",
-        target_os = "hermit"
+        target_os = "hermit",
+        target_os = "linux",
     )
 ))]
 mod eventfd {
@@ -123,7 +123,7 @@ mod eventfd {
             }
         }
 
-        #[cfg(any(mio_unsupported_force_poll_poll, target_os = "hermit"))]
+        #[cfg(any(mio_unsupported_force_poll_poll, target_os = "espidf", target_os = "hermit"))]
         pub fn ack_and_reset(&self) {
             let _ = self.reset();
         }
@@ -150,9 +150,12 @@ mod eventfd {
 }
 
 #[cfg(all(
-    mio_unsupported_force_poll_poll,
     not(mio_unsupported_force_waker_pipe),
-    any(target_os = "linux", target_os = "android", target_os = "espidf")
+    any(
+        target_os = "android",
+        target_os = "espidf",
+        target_os = "linux",
+    )
 ))]
 pub(crate) use self::eventfd::WakerInternal;
 
@@ -269,8 +272,9 @@ mod pipe {
 
         #[cfg(any(
             mio_unsupported_force_poll_poll,
+            target_os = "espidf",
             target_os = "solaris",
-            target_os = "vita"
+            target_os = "vita",
         ))]
         pub fn ack_and_reset(&self) {
             self.empty();
@@ -316,9 +320,10 @@ pub(crate) use self::pipe::WakerInternal;
 
 #[cfg(any(
     mio_unsupported_force_poll_poll,
+    target_os = "espidf",
+    target_os = "hermit",
     target_os = "solaris",
     target_os = "vita",
-    target_os = "hermit"
 ))]
 mod poll {
     use crate::sys::Selector;
@@ -347,8 +352,9 @@ mod poll {
 
 #[cfg(any(
     mio_unsupported_force_poll_poll,
+    target_os = "espidf",
+    target_os = "hermit",
     target_os = "solaris",
     target_os = "vita",
-    target_os = "hermit"
 ))]
 pub use self::poll::Waker;