Merge pull request compio-rs#232 from Berrysoft/fix/poll-file-blocking

Author: George-Miao

compio-driver/src/poll/op.rs

@@ -178,11 +178,7 @@ impl IntoInner for PathStat {
 
 impl<T: IoBufMut> OpCode for ReadAt<T> {
     fn pre_submit(self: Pin<&mut Self>) -> io::Result<Decision> {
-        if cfg!(any(target_os = "linux", target_os = "android")) {
-            Ok(Decision::blocking_readable(self.fd))
-        } else {
-            Ok(Decision::wait_readable(self.fd))
-        }
+        Ok(Decision::blocking_readable(self.fd))
     }
 
     fn on_event(self: Pin<&mut Self>, event: &Event) -> Poll<io::Result<usize>> {
@@ -197,11 +193,7 @@ impl<T: IoBufMut> OpCode for ReadAt<T> {
 
 impl<T: IoVectoredBufMut> OpCode for ReadVectoredAt<T> {
     fn pre_submit(self: Pin<&mut Self>) -> io::Result<Decision> {
-        if cfg!(any(target_os = "linux", target_os = "android")) {
-            Ok(Decision::blocking_readable(self.fd))
-        } else {
-            Ok(Decision::wait_readable(self.fd))
-        }
+        Ok(Decision::blocking_readable(self.fd))
     }
 
     fn on_event(self: Pin<&mut Self>, event: &Event) -> Poll<io::Result<usize>> {
@@ -222,11 +214,7 @@ impl<T: IoVectoredBufMut> OpCode for ReadVectoredAt<T> {
 
 impl<T: IoBuf> OpCode for WriteAt<T> {
     fn pre_submit(self: Pin<&mut Self>) -> io::Result<Decision> {
-        if cfg!(any(target_os = "linux", target_os = "android")) {
-            Ok(Decision::blocking_writable(self.fd))
-        } else {
-            Ok(Decision::wait_writable(self.fd))
-        }
+        Ok(Decision::blocking_writable(self.fd))
     }
 
     fn on_event(self: Pin<&mut Self>, event: &Event) -> Poll<io::Result<usize>> {
@@ -246,11 +234,7 @@ impl<T: IoBuf> OpCode for WriteAt<T> {
 
 impl<T: IoVectoredBuf> OpCode for WriteVectoredAt<T> {
     fn pre_submit(self: Pin<&mut Self>) -> io::Result<Decision> {
-        if cfg!(any(target_os = "linux", target_os = "android")) {
-            Ok(Decision::blocking_writable(self.fd))
-        } else {
-            Ok(Decision::wait_writable(self.fd))
-        }
+        Ok(Decision::blocking_writable(self.fd))
     }
 
     fn on_event(self: Pin<&mut Self>, event: &Event) -> Poll<io::Result<usize>> {

compio-driver/tests/file.rs

@@ -31,12 +31,11 @@ fn open_file_op() -> impl OpCode {
 
     use compio_driver::op::OpenFile;
 
-    let mut flags = libc::O_CLOEXEC | libc::O_RDONLY;
-    if cfg!(not(any(target_os = "linux", target_os = "android"))) {
-        flags |= libc::O_NONBLOCK;
-    }
-
-    OpenFile::new(CString::new("Cargo.toml").unwrap(), flags, 0o666)
+    OpenFile::new(
+        CString::new("Cargo.toml").unwrap(),
+        libc::O_CLOEXEC | libc::O_RDONLY,
+        0o666,
+    )
 }
 
 fn push_and_wait<O: OpCode + 'static>(driver: &mut Proactor, op: O) -> (usize, O) {

compio-fs/src/open_options/unix.rs

@@ -81,14 +81,10 @@ impl OpenOptions {
     }
 
     pub async fn open(&self, p: impl AsRef<Path>) -> io::Result<File> {
-        let mut flags = libc::O_CLOEXEC
+        let flags = libc::O_CLOEXEC
             | self.get_access_mode()?
             | self.get_creation_mode()?
             | (self.custom_flags as libc::c_int & !libc::O_ACCMODE);
-        // Don't set nonblocking with epoll.
-        if cfg!(not(any(target_os = "linux", target_os = "android"))) {
-            flags |= libc::O_NONBLOCK;
-        }
         let p = path_string(p)?;
         let op = OpenFile::new(p, flags, self.mode);
         let fd = Runtime::current().submit(op).await.0? as RawFd;

compio/examples/driver.rs

@@ -34,12 +34,11 @@ fn open_file_op() -> impl OpCode {
 
     use compio::driver::op::OpenFile;
 
-    let mut flags = libc::O_CLOEXEC | libc::O_RDONLY;
-    if cfg!(not(any(target_os = "linux", target_os = "android"))) {
-        flags |= libc::O_NONBLOCK;
-    }
-
-    OpenFile::new(CString::new("Cargo.toml").unwrap(), flags, 0o666)
+    OpenFile::new(
+        CString::new("Cargo.toml").unwrap(),
+        libc::O_CLOEXEC | libc::O_RDONLY,
+        0o666,
+    )
 }
 
 fn push_and_wait<O: OpCode + 'static>(driver: &mut Proactor, op: O) -> (usize, O) {