Merge pull request #36 from compio-rs/dev/advanced-pollable

Berrysoft · web-flow · commit 89f9f3822b92 · 2025-07-02T01:34:37.000+08:00
feat(pollable): move common used code
diff --git a/winio-pollable/src/lib.rs b/winio-pollable/src/lib.rs
@@ -8,8 +8,10 @@
 #[cfg(target_os = "linux")]
 use std::os::fd::OwnedFd;
 use std::{
+    future::Future,
     io,
     ops::{Deref, DerefMut},
+    time::Duration,
 };
 
 use compio::driver::{AsRawFd, RawFd};
@@ -44,7 +46,7 @@ impl Runtime {
     }
 
     /// Clear the eventfd, if possible.
-    pub fn clear(&self) -> io::Result<()> {
+    pub(crate) fn clear(&self) -> io::Result<()> {
         if let Some(efd) = &self.efd {
             let mut buf = [0u8; 8];
             rustix::io::read(efd, &mut buf)?;
@@ -63,11 +65,42 @@ impl Runtime {
     }
 
     /// Clear the eventfd, if possible.
-    pub fn clear(&self) -> io::Result<()> {
+    pub(crate) fn clear(&self) -> io::Result<()> {
         Ok(())
     }
 }
 
+impl Runtime {
+    /// Block on the future till it completes. Users should enter the runtime
+    /// before calling this function, and poll the runtime themselves.
+    pub fn block_on<F: Future>(&self, future: F, poll: impl Fn(Option<Duration>)) -> F::Output {
+        let mut result = None;
+        unsafe {
+            self.runtime
+                .spawn_unchecked(async { result = Some(future.await) })
+        }
+        .detach();
+        loop {
+            self.runtime.poll_with(Some(Duration::ZERO));
+
+            let remaining_tasks = self.runtime.run();
+            if let Some(result) = result.take() {
+                break result;
+            }
+
+            let timeout = if remaining_tasks {
+                Some(Duration::ZERO)
+            } else {
+                self.runtime.current_timeout()
+            };
+
+            poll(timeout);
+
+            self.clear().ok();
+        }
+    }
+}
+
 impl Deref for Runtime {
     type Target = compio::runtime::Runtime;
 
diff --git a/winio-ui-app-kit/Cargo.toml b/winio-ui-app-kit/Cargo.toml
@@ -12,8 +12,9 @@ repository = { workspace = true }
 winio-primitive = { workspace = true }
 winio-handle = { workspace = true }
 winio-callback = { workspace = true }
+winio-pollable = { workspace = true }
 
-compio = { workspace = true }
+compio = { workspace = true, features = ["arrayvec"] }
 
 inherit-methods-macro = { workspace = true }
 image = { workspace = true, default-features = false }
diff --git a/winio-ui-app-kit/src/runtime.rs b/winio-ui-app-kit/src/runtime.rs
@@ -10,7 +10,7 @@ use objc2_core_foundation::{
 use objc2_foundation::{MainThreadMarker, NSDate, NSDefaultRunLoopMode};
 
 pub struct Runtime {
-    runtime: compio::runtime::Runtime,
+    runtime: winio_pollable::Runtime,
     fd_source: CFRetained<CFFileDescriptor>,
     ns_app: Retained<NSApplication>,
 }
@@ -23,7 +23,7 @@ impl Default for Runtime {
 
 impl Runtime {
     pub fn new() -> Self {
-        let runtime = compio::runtime::Runtime::new().unwrap();
+        let runtime = winio_pollable::Runtime::new().unwrap();
 
         unsafe extern "C-unwind" fn callback(
             _fdref: *mut CFFileDescriptor,
@@ -73,25 +73,7 @@ impl Runtime {
 
     pub fn block_on<F: Future>(&self, future: F) -> F::Output {
         self.enter(|| {
-            let mut result = None;
-            unsafe {
-                self.runtime
-                    .spawn_unchecked(async { result = Some(future.await) })
-            }
-            .detach();
-            loop {
-                self.runtime.poll_with(Some(Duration::ZERO));
-
-                let remaining_tasks = self.runtime.run();
-                if let Some(result) = result.take() {
-                    break result;
-                }
-
-                let timeout = if remaining_tasks {
-                    Some(Duration::ZERO)
-                } else {
-                    self.runtime.current_timeout()
-                };
+            self.runtime.block_on(future, |timeout| {
                 self.fd_source
                     .enable_call_backs(kCFFileDescriptorReadCallBack);
                 CFRunLoop::run_in_mode(
@@ -114,7 +96,7 @@ impl Runtime {
                         }
                     }
                 }
-            }
+            })
         })
     }
 }
diff --git a/winio-ui-app-kit/src/ui/msgbox.rs b/winio-ui-app-kit/src/ui/msgbox.rs
@@ -1,7 +1,7 @@
 use std::{cell::Cell, rc::Rc};
 
 use block2::StackBlock;
-use compio::buf::arrayvec::ArrayVec;
+use compio::arrayvec::ArrayVec;
 use objc2::rc::Retained;
 use objc2_app_kit::{
     NSAlert, NSAlertFirstButtonReturn, NSAlertStyle, NSImage, NSImageNameCaution, NSImageNameInfo,
diff --git a/winio-ui-gtk/src/runtime.rs b/winio-ui-gtk/src/runtime.rs
@@ -1,4 +1,4 @@
-use std::{future::Future, os::fd::AsRawFd, time::Duration};
+use std::{future::Future, os::fd::AsRawFd};
 
 use gtk4::{
     gio::{self, prelude::ApplicationExt},
@@ -45,25 +45,7 @@ impl Runtime {
 
     pub fn block_on<F: Future>(&self, future: F) -> F::Output {
         self.enter(|| {
-            let mut result = None;
-            unsafe {
-                self.runtime
-                    .spawn_unchecked(async { result = Some(future.await) })
-            }
-            .detach();
-            loop {
-                self.runtime.poll_with(Some(Duration::ZERO));
-
-                let remaining_tasks = self.runtime.run();
-                if let Some(result) = result.take() {
-                    break result;
-                }
-
-                let timeout = if remaining_tasks {
-                    Some(Duration::ZERO)
-                } else {
-                    self.runtime.current_timeout()
-                };
+            self.runtime.block_on(future, |timeout| {
                 let source_id = timeout.map(|timeout| timeout_add_local_once(timeout, || {}));
 
                 self.ctx.iteration(true);
@@ -73,9 +55,7 @@ impl Runtime {
                         source_id.remove();
                     }
                 }
-
-                self.runtime.clear().ok();
-            }
+            })
         })
     }
 }
diff --git a/winio-ui-qt/src/runtime/qt.rs b/winio-ui-qt/src/runtime/qt.rs
@@ -1,4 +1,4 @@
-use std::{cell::RefCell, future::Future, os::fd::AsRawFd, time::Duration};
+use std::{cell::RefCell, future::Future, os::fd::AsRawFd};
 
 use cxx::UniquePtr;
 
@@ -57,26 +57,7 @@ impl Runtime {
 
     pub fn block_on<F: Future>(&self, future: F) -> F::Output {
         self.enter(|| {
-            let mut result = None;
-            unsafe {
-                self.runtime
-                    .spawn_unchecked(async { result = Some(future.await) })
-            }
-            .detach();
-            loop {
-                self.runtime.poll_with(Some(Duration::ZERO));
-
-                let remaining_tasks = self.runtime.run();
-                if let Some(result) = result.take() {
-                    break result;
-                }
-
-                let timeout = if remaining_tasks {
-                    Some(Duration::ZERO)
-                } else {
-                    self.runtime.current_timeout()
-                };
-
+            self.runtime.block_on(future, |timeout| {
                 if let Some(timeout) = timeout {
                     self.event_loop
                         .borrow_mut()
@@ -85,9 +66,7 @@ impl Runtime {
                 } else {
                     self.event_loop.borrow_mut().pin_mut().process();
                 }
-
-                self.runtime.clear().ok();
-            }
+            })
         })
     }
 }
diff --git a/winio-ui-win32/Cargo.toml b/winio-ui-win32/Cargo.toml
@@ -11,6 +11,7 @@ repository = { workspace = true }
 [target.'cfg(windows)'.dependencies]
 winio-primitive = { workspace = true }
 winio-handle = { workspace = true }
+winio-pollable = { workspace = true }
 
 compio = { workspace = true, features = ["arrayvec"] }
 compio-log = { workspace = true }
diff --git a/winio-ui-win32/src/runtime.rs b/winio-ui-win32/src/runtime.rs
@@ -6,7 +6,6 @@ use std::{
     pin::Pin,
     ptr::{null, null_mut},
     task::{Context, Poll, Waker},
-    time::Duration,
 };
 
 use compio::driver::AsRawFd;
@@ -80,7 +79,7 @@ impl Default for FutureState {
 }
 
 pub struct Runtime {
-    runtime: compio::runtime::Runtime,
+    runtime: winio_pollable::Runtime,
     d2d1: OnceCell<ID2D1Factory>,
     registry: RefCell<HashMap<(HWND, u32), Slab<FutureState>>>,
 }
@@ -97,7 +96,7 @@ impl Runtime {
             init_dark();
         }
 
-        let runtime = compio::runtime::Runtime::new().unwrap();
+        let runtime = winio_pollable::Runtime::new().unwrap();
 
         Self {
             runtime,
@@ -118,25 +117,7 @@ impl Runtime {
 
     pub fn block_on<F: Future>(&self, future: F) -> F::Output {
         self.enter(|| {
-            let mut result = None;
-            unsafe {
-                self.runtime
-                    .spawn_unchecked(async { result = Some(future.await) })
-            }
-            .detach();
-            loop {
-                self.runtime.poll_with(Some(Duration::ZERO));
-
-                let remaining_tasks = self.runtime.run();
-                if let Some(result) = result.take() {
-                    break result;
-                }
-
-                let timeout = if remaining_tasks {
-                    Some(Duration::ZERO)
-                } else {
-                    self.runtime.current_timeout()
-                };
+            self.runtime.block_on(future, |timeout| {
                 let timeout = match timeout {
                     Some(timeout) => timeout.as_millis() as u32,
                     None => INFINITE,
@@ -171,7 +152,7 @@ impl Runtime {
                         break;
                     }
                 }
-            }
+            })
         })
     }
 
