Add Handler::tick() method (#12)

Author: fafhrd91

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.2.2] - 2025-12-16
+
+* Add Handler::tick() method, indicates one turn of reactor
+
 ## [0.2.1] - 2025-12-15
 
 * Clear driver within runtime

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-neon"
-version = "0.2.1"
+version = "0.2.2"
 description = "Async runtime for ntex"
 categories = ["asynchronous"]
 keywords = ["async", "runtime"]

src/driver/iour.rs

@@ -1,10 +1,10 @@
 use std::os::fd::{AsRawFd, FromRawFd, OwnedFd, RawFd};
 use std::{cell::Cell, cell::RefCell, cmp, collections::VecDeque, io, mem, rc::Rc, sync::Arc};
 
-use io_uring::cqueue::{self, Entry as CEntry, more};
+use io_uring::cqueue::{self, more, Entry as CEntry};
 use io_uring::opcode::{AsyncCancel, PollAdd};
 use io_uring::squeue::{Entry as SEntry, SubmissionQueue};
-use io_uring::{IoUring, Probe, types::Fd};
+use io_uring::{types::Fd, IoUring, Probe};
 
 use crate::pool::Dispatchable;
 
@@ -17,6 +17,9 @@ pub trait Handler {
     /// Operation is canceled
     fn canceled(&mut self, id: usize);
 
+    /// Driver turn is completed
+    fn tick(&mut self);
+
     /// Cleanup before drop
     fn cleanup(&mut self);
 }
@@ -97,10 +100,25 @@ pub struct Driver {
     fd: RawFd,
     hid: Cell<u64>,
     notifier: Notifier,
-    handlers: Cell<Option<Box<Vec<Box<dyn Handler>>>>>,
+    #[allow(clippy::box_collection)]
+    handlers: Cell<Option<Box<Vec<HandlerItem>>>>,
     inner: Rc<DriverInner>,
 }
 
+struct HandlerItem {
+    hnd: Box<dyn Handler>,
+    modified: bool,
+}
+
+impl HandlerItem {
+    fn tick(&mut self) {
+        if self.modified {
+            self.modified = false;
+            self.hnd.tick();
+        }
+    }
+}
+
 bitflags::bitflags! {
     #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     struct Flags: u8 {
@@ -189,10 +207,13 @@ impl Driver {
     {
         let id = self.hid.get();
         let mut handlers = self.handlers.take().unwrap_or_default();
-        handlers.push(f(DriverApi {
-            batch: id << Self::BATCH,
-            inner: self.inner.clone(),
-        }));
+        handlers.push(HandlerItem {
+            hnd: f(DriverApi {
+                batch: id << Self::BATCH,
+                inner: self.inner.clone(),
+            }),
+            modified: false,
+        });
         self.handlers.set(Some(handlers));
         self.hid.set(id + 1);
     }
@@ -300,18 +321,25 @@ impl Driver {
 
                         let result = entry.result();
                         if result == -libc::ECANCELED {
-                            handlers[batch].canceled(user_data);
+                            handlers[batch].modified = true;
+                            handlers[batch].hnd.canceled(user_data);
                         } else {
                             let result = if result < 0 {
                                 Err(io::Error::from_raw_os_error(-result))
                             } else {
                                 Ok(result as _)
                             };
-                            handlers[batch].completed(user_data, entry.flags(), result);
+                            handlers[batch].modified = true;
+                            handlers[batch]
+                                .hnd
+                                .completed(user_data, entry.flags(), result);
                         }
                     }
                 }
             }
+            for h in handlers.iter_mut() {
+                h.tick();
+            }
             self.handlers.set(Some(handlers));
         }
     }
@@ -323,7 +351,7 @@ impl Driver {
 
     pub(crate) fn clear(&self) {
         for mut h in self.handlers.take().unwrap().into_iter() {
-            h.cleanup()
+            h.hnd.cleanup()
         }
     }
 }

src/driver/poll.rs

@@ -13,6 +13,9 @@ pub trait Handler {
     /// Operation submission has failed
     fn error(&mut self, id: usize, err: io::Error);
 
+    /// Driver turn is completed
+    fn tick(&mut self);
+
     /// Cleanup before drop
     fn cleanup(&mut self);
 }
@@ -108,7 +111,22 @@ pub struct Driver {
     capacity: usize,
     changes: Rc<UnsafeCell<VecDeque<Change>>>,
     hid: Cell<u64>,
-    handlers: Cell<Option<Box<Vec<Box<dyn Handler>>>>>,
+    #[allow(clippy::box_collection)]
+    handlers: Cell<Option<Box<Vec<HandlerItem>>>>,
+}
+
+struct HandlerItem {
+    hnd: Box<dyn Handler>,
+    modified: bool,
+}
+
+impl HandlerItem {
+    fn tick(&mut self) {
+        if self.modified {
+            self.modified = false;
+            self.hnd.tick();
+        }
+    }
 }
 
 impl Driver {
@@ -150,7 +168,10 @@ impl Driver {
             poll: self.poll.clone(),
             changes: self.changes.clone(),
         };
-        handlers.push(f(api));
+        handlers.push(HandlerItem {
+            hnd: f(api),
+            modified: false,
+        });
         self.hid.set(id + 1);
         self.handlers.set(Some(handlers));
     }
@@ -187,21 +208,27 @@ impl Driver {
             for event in events.iter() {
                 let key = event.key as u64;
                 let batch = ((key & Self::BATCH_MASK) >> Self::BATCH) as usize;
-                handlers[batch].event((key & Self::DATA_MASK) as usize, event)
+                handlers[batch].modified = true;
+                handlers[batch]
+                    .hnd
+                    .event((key & Self::DATA_MASK) as usize, event)
             }
             self.apply_changes(&mut handlers);
+            for h in handlers.iter_mut() {
+                h.tick();
+            }
             self.handlers.set(Some(handlers));
         }
     }
 
-    fn apply_changes(&self, handlers: &mut [Box<dyn Handler>]) {
+    fn apply_changes(&self, handlers: &mut [HandlerItem]) {
         while let Some(op) = unsafe { (*self.changes.get()).pop_front() } {
             match op {
                 Change::Error {
                     batch,
                     user_data,
                     error,
-                } => handlers[batch].error(user_data as usize, error),
+                } => handlers[batch].hnd.error(user_data as usize, error),
                 Change::Blocking(f) => {
                     let _ = crate::Runtime::with_current(|rt| rt.pool.dispatch(f));
                 }
@@ -216,7 +243,7 @@ impl Driver {
 
     pub(crate) fn clear(&self) {
         for mut h in self.handlers.take().unwrap().into_iter() {
-            h.cleanup()
+            h.hnd.cleanup()
         }
     }
 }