X-Git-Url: https://git.proxmox.com/?p=pve-lxc-syscalld.git;a=blobdiff_plain;f=src%2Fio%2Fpolled_fd.rs;h=6ea19398822cd23a79d269bbdcfc038fd647ed79;hp=8a17d76c61ee6218a0d206876bbfbceede0da2e4;hb=7a1ab2b21eaf49e8d89f57397f097f7fd7632058;hpb=5bd0c5620f6f1339a5cfec8318fb525d457a7f61

diff --git a/src/io/polled_fd.rs b/src/io/polled_fd.rs
index 8a17d76..6ea1939 100644
--- a/src/io/polled_fd.rs
+++ b/src/io/polled_fd.rs
@@ -2,11 +2,7 @@ use std::io;
 use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use std::task::{Context, Poll};
 
-use mio::event::Evented;
-use mio::unix::EventedFd as MioEventedFd;
-use mio::Poll as MioPoll;
-use mio::{PollOpt, Ready, Token};
-use tokio::io::PollEvented;
+use tokio::io::unix::AsyncFd;
 
 use crate::tools::Fd;
 
@@ -43,41 +39,15 @@ impl IntoRawFd for EventedFd {
     }
 }
 
-impl Evented for EventedFd {
-    fn register(
-        &self,
-        poll: &MioPoll,
-        token: Token,
-        interest: Ready,
-        opts: PollOpt,
-    ) -> io::Result<()> {
-        MioEventedFd(self.fd.as_ref()).register(poll, token, interest, opts)
-    }
-
-    fn reregister(
-        &self,
-        poll: &MioPoll,
-        token: Token,
-        interest: Ready,
-        opts: PollOpt,
-    ) -> io::Result<()> {
-        MioEventedFd(self.fd.as_ref()).reregister(poll, token, interest, opts)
-    }
-
-    fn deregister(&self, poll: &MioPoll) -> io::Result<()> {
-        MioEventedFd(self.fd.as_ref()).deregister(poll)
-    }
-}
-
 #[repr(transparent)]
 pub struct PolledFd {
-    fd: PollEvented<EventedFd>,
+    fd: AsyncFd<EventedFd>,
 }
 
 impl PolledFd {
     pub fn new(fd: Fd) -> tokio::io::Result<Self> {
         Ok(Self {
-            fd: PollEvented::new(EventedFd::new(fd))?,
+            fd: AsyncFd::new(EventedFd::new(fd))?,
         })
     }
 
@@ -86,11 +56,11 @@ impl PolledFd {
         cx: &mut Context,
         func: impl FnOnce() -> io::Result<T>,
     ) -> Poll<io::Result<T>> {
-        ready!(self.fd.poll_read_ready(cx, mio::Ready::readable()))?;
+        let mut ready_guard = ready!(self.fd.poll_read_ready(cx))?;
         match func() {
             Ok(out) => Poll::Ready(Ok(out)),
             Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
-                self.fd.clear_read_ready(cx, mio::Ready::readable())?;
+                ready_guard.clear_ready();
                 Poll::Pending
             }
             Err(err) => Poll::Ready(Err(err)),
@@ -102,11 +72,11 @@ impl PolledFd {
         cx: &mut Context,
         func: impl FnOnce() -> io::Result<T>,
     ) -> Poll<io::Result<T>> {
-        ready!(self.fd.poll_write_ready(cx))?;
+        let mut ready_guard = ready!(self.fd.poll_write_ready(cx))?;
         match func() {
             Ok(out) => Poll::Ready(Ok(out)),
             Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => {
-                self.fd.clear_write_ready(cx)?;
+                ready_guard.clear_ready();
                 Poll::Pending
             }
             Err(err) => Poll::Ready(Err(err)),
@@ -128,7 +98,6 @@ impl IntoRawFd for PolledFd {
         // its driver
         self.fd
             .into_inner()
-            .expect("failed to remove polled file descriptor from reactor")
             .into_raw_fd()
     }
 }