Merge pull request #273 from Sherlock-Holo/better-io-uring-cqe-more

refactor(driver): better IORING_CQE_F_MORE handle

Author: Berrysoft

compio-driver/src/iour/mod.rs

@@ -20,6 +20,7 @@ cfg_if::cfg_if! {
     }
 }
 use io_uring::{
+    cqueue::more,
     opcode::{AsyncCancel, PollAdd},
     types::{Fd, SubmitArgs, Timespec},
     IoUring,
@@ -152,9 +153,8 @@ impl Driver {
         let completed_entries = cqueue.filter_map(|entry| match entry.user_data() {
             Self::CANCEL => None,
             Self::NOTIFY => {
-                const IORING_CQE_F_MORE: u32 = 1 << 1;
                 let flags = entry.flags();
-                debug_assert!(flags & IORING_CQE_F_MORE == IORING_CQE_F_MORE);
+                debug_assert!(more(flags));
                 self.notifier.clear().expect("cannot clear notifier");
                 None
             }

compio-io/src/compat.rs

@@ -67,9 +67,8 @@ impl<S> SyncStream<S> {
 impl<S> Read for SyncStream<S> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         let mut slice = self.fill_buf()?;
-        slice.read(buf).map(|res| {
-            self.consume(res);
-            res
+        slice.read(buf).inspect(|res| {
+            self.consume(*res);
         })
     }
 

compio/tests/runtime.rs

@@ -127,6 +127,10 @@ async fn drop_on_complete() {
 }
 
 #[compio_macros::test]
+#[cfg_attr(
+    not(any(windows, all(target_os = "linux", feature = "io-uring"))),
+    ignore
+)]
 async fn too_many_submissions() {
     let tempfile = tempfile();