feat(driver): expose PortId instead of usize

Author: Berrysoft

compio-driver/src/iocp/cp/global.rs

@@ -11,10 +11,13 @@ use crossbeam_channel::{unbounded, Receiver, RecvTimeoutError, Sender, TryRecvEr
 use crossbeam_skiplist::SkipMap;
 #[cfg(not(feature = "once_cell_try"))]
 use once_cell::sync::OnceCell as OnceLock;
-use windows_sys::Win32::Foundation::ERROR_TIMEOUT;
+use windows_sys::Win32::{
+    Foundation::ERROR_TIMEOUT,
+    System::IO::{PostQueuedCompletionStatus, OVERLAPPED},
+};
 
 use super::CompletionPort;
-use crate::{Entry, Overlapped, RawFd};
+use crate::{syscall, Entry, Overlapped, RawFd};
 
 struct GlobalPort {
     port: CompletionPort,
@@ -75,7 +78,7 @@ fn iocp_start() -> io::Result<()> {
     std::thread::spawn(move || {
         loop {
             for (driver, entry) in port.port.poll(None, None)? {
-                port.push(driver, entry);
+                port.push(driver.0, entry);
             }
         }
         #[allow(unreachable_code)]
@@ -103,8 +106,8 @@ impl Port {
         Ok(Self { id, port, receiver })
     }
 
-    pub fn id(&self) -> usize {
-        self.id
+    pub fn id(&self) -> PortId {
+        PortId(self.id)
     }
 
     pub fn attach(&mut self, fd: RawFd) -> io::Result<()> {
@@ -160,3 +163,18 @@ impl PortHandle {
         self.port.post(res, optr)
     }
 }
+
+/// The unique ID of IOCP driver.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct PortId(usize);
+
+impl PortId {
+    /// Post raw entry to IOCP.
+    pub fn post_raw(&self, transferred: u32, key: usize, optr: *mut OVERLAPPED) -> io::Result<()> {
+        syscall!(
+            BOOL,
+            PostQueuedCompletionStatus(iocp_port()?.as_raw_handle() as _, transferred, key, optr)
+        )?;
+        Ok(())
+    }
+}

compio-driver/src/iocp/cp/mod.rs

@@ -91,8 +91,8 @@ impl CompletionPort {
     pub fn poll(
         &self,
         timeout: Option<Duration>,
-        current_driver: Option<usize>,
-    ) -> io::Result<impl Iterator<Item = (usize, Entry)>> {
+        current_driver: Option<PortId>,
+    ) -> io::Result<impl Iterator<Item = (PortId, Entry)>> {
         const DEFAULT_CAPACITY: usize = 1024;
 
         let mut entries = ArrayVec::<OVERLAPPED_ENTRY, { DEFAULT_CAPACITY }>::new();
@@ -123,16 +123,14 @@ impl CompletionPort {
             let overlapped = unsafe { &*overlapped_ptr };
             if let Some(current_driver) = current_driver {
                 if overlapped.driver != current_driver {
-                    syscall!(
-                        BOOL,
-                        PostQueuedCompletionStatus(
-                            overlapped.driver as _,
+                    overlapped
+                        .driver
+                        .post_raw(
                             entry.dwNumberOfBytesTransferred,
                             entry.lpCompletionKey,
-                            entry.lpOverlapped
+                            entry.lpOverlapped,
                         )
-                    )
-                    .ok();
+                        .ok();
                 }
             }
             let res = if matches!(

compio-driver/src/iocp/cp/multi.rs

@@ -1,7 +1,12 @@
 use std::{io, os::windows::io::AsRawHandle, sync::Arc, time::Duration};
 
+use windows_sys::Win32::{
+    Foundation::HANDLE,
+    System::IO::{PostQueuedCompletionStatus, OVERLAPPED},
+};
+
 use super::CompletionPort;
-use crate::{Entry, Overlapped, RawFd};
+use crate::{syscall, Entry, Overlapped, RawFd};
 
 pub struct Port {
     port: Arc<CompletionPort>,
@@ -14,8 +19,8 @@ impl Port {
         })
     }
 
-    pub fn id(&self) -> usize {
-        self.port.as_raw_handle() as _
+    pub fn id(&self) -> PortId {
+        PortId(self.port.as_raw_handle() as _)
     }
 
     pub fn attach(&mut self, fd: RawFd) -> io::Result<()> {
@@ -55,3 +60,18 @@ impl PortHandle {
         self.port.post(res, optr)
     }
 }
+
+/// The unique ID of IOCP driver.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct PortId(HANDLE);
+
+impl PortId {
+    /// Post raw entry to IOCP.
+    pub fn post_raw(&self, transferred: u32, key: usize, optr: *mut OVERLAPPED) -> io::Result<()> {
+        syscall!(
+            BOOL,
+            PostQueuedCompletionStatus(self.0, transferred, key, optr)
+        )?;
+        Ok(())
+    }
+}

compio-driver/src/iocp/mod.rs

@@ -294,7 +294,7 @@ pub struct Overlapped<T: ?Sized> {
     /// The base [`OVERLAPPED`].
     pub base: OVERLAPPED,
     /// The unique ID of created driver.
-    pub driver: usize,
+    pub driver: cp::PortId,
     /// The registered user defined data.
     pub user_data: usize,
     /// The opcode.
@@ -303,7 +303,7 @@ pub struct Overlapped<T: ?Sized> {
 }
 
 impl<T> Overlapped<T> {
-    pub(crate) fn new(driver: usize, user_data: usize, op: T) -> Self {
+    pub(crate) fn new(driver: cp::PortId, user_data: usize, op: T) -> Self {
         Self {
             base: unsafe { std::mem::zeroed() },
             driver,
@@ -326,7 +326,7 @@ pub(crate) struct RawOp {
 }
 
 impl RawOp {
-    pub(crate) fn new(driver: usize, user_data: usize, op: impl OpCode + 'static) -> Self {
+    pub(crate) fn new(driver: cp::PortId, user_data: usize, op: impl OpCode + 'static) -> Self {
         let op = Overlapped::new(driver, user_data, op);
         let op = Box::new(op) as Box<Overlapped<dyn OpCode>>;
         Self {