Merge pull request #68 from Berrysoft/dev/linux-polling

Make polling available on Linux.

Author: Berrysoft

Cargo.toml

@@ -70,7 +70,8 @@ windows-sys = { version = "0.48", features = ["Win32_Security_Authorization"] }
 
 # Linux specific dependencies
 [target.'cfg(target_os = "linux")'.dependencies]
-io-uring = "0.6"
+io-uring = { version = "0.6", optional = true }
+polling = { version = "3", optional = true }
 libc = "0.2"
 
 # Other platform dependencies
@@ -79,7 +80,7 @@ polling = "3"
 libc = "0.2"
 
 [features]
-default = ["runtime"]
+default = ["runtime", "io-uring"]
 runtime = ["dep:async-task", "dep:futures-util", "dep:smallvec"]
 event = ["runtime", "arrayvec"]
 signal = ["event"]

azure-pipelines.yml

@@ -20,7 +20,7 @@ jobs:
       - script: |
           rustup toolchain install nightly
           rustup +nightly target install $(target)
-          cargo +nightly test --features=all,nightly --no-default-features --target $(target) -Z doctest-xcompile
+          cargo +nightly test --features=all,nightly --target $(target) -Z doctest-xcompile
         displayName: TestNightly
       - script: |
           cargo test --features all --target $(target)
@@ -39,12 +39,20 @@ jobs:
     steps:
       - script: |
           rustup toolchain install nightly
-          cargo +nightly test --features all,nightly --no-default-features
+          cargo +nightly test --features all,nightly
         displayName: TestNightly
       - script: |
           cargo test --features all
         displayName: TestStable
 
+      - script: |
+          rustup toolchain install nightly
+          cargo +nightly test --features all,polling,nightly --no-default-features
+        displayName: TestNightly-polling
+      - script: |
+          cargo test --features all,polling --no-default-features
+        displayName: TestStable-polling
+
   - job: Test_Mac
     strategy:
       matrix:
@@ -58,7 +66,7 @@ jobs:
     steps:
       - script: |
           rustup toolchain install nightly
-          cargo +nightly test --features all,nightly --no-default-features
+          cargo +nightly test --features all,nightly
         displayName: TestNightly
       - script: |
           cargo test --features all

src/driver/mod.rs

@@ -1,22 +1,30 @@
 //! The platform-specified driver.
 //! Some types differ by compilation target.
 
+#[cfg(all(
+    target_os = "linux",
+    not(feature = "io-uring"),
+    not(feature = "polling")
+))]
+compile_error!("You must choose one of these features: [\"io-uring\", \"polling\"]");
+
 use std::{collections::VecDeque, io, time::Duration};
 
 use slab::Slab;
 
 use crate::BufResult;
+
 #[cfg(unix)]
 mod unix;
 
 cfg_if::cfg_if! {
     if #[cfg(target_os = "windows")] {
         mod iocp;
         pub use iocp::*;
-    } else if #[cfg(target_os = "linux")] {
+    } else if #[cfg(all(target_os = "linux", feature = "io-uring"))] {
         mod iour;
         pub use iour::*;
-    } else if #[cfg(unix)]{
+    } else if #[cfg(unix)] {
         mod poll;
         pub use poll::*;
     }

src/net/socket.rs

@@ -59,7 +59,7 @@ impl Socket {
         // non blocking socket when there is no connections in listen queue
         //
         // https://patchwork.kernel.org/project/linux-block/patch/[email protected]/#22949861
-        #[cfg(all(unix, not(target_os = "linux")))]
+        #[cfg(all(unix, not(all(target_os = "linux", feature = "io-uring"))))]
         socket.set_nonblocking(true)?;
         Ok(Self::from_socket2(socket))
     }