backend: delete dead clients from epoll

Smithay · Jun 25, 2024 · 6885222 · 6885222
1 parent 48e74e9
commit 6885222
Showing 1 changed file with 34 additions and 4 deletions.
diff --git a/wayland-backend/src/rs/server_impl/common_poll.rs b/wayland-backend/src/rs/server_impl/common_poll.rs
@@ -71,7 +71,7 @@ impl<D> InnerBackend<D> {
         data: &mut D,
         client_id: InnerClientId,
     ) -> std::io::Result<usize> {
-        let ret = self.dispatch_events_for(data, client_id);
+        let ret = self.dispatch_events_for(data, self.poll_fd(), client_id);
         let cleanup = self.state.lock().unwrap().cleanup();
         cleanup(&self.handle(), data);
         ret
@@ -94,7 +94,7 @@ impl<D> InnerBackend<D> {
             for event in events.iter() {
                 let id = InnerClientId::from_u64(event.data.u64());
                 // remove the cb while we call it, to gracefully handle reentrancy
-                if let Ok(count) = self.dispatch_events_for(data, id) {
+                if let Ok(count) = self.dispatch_events_for(data, poll_fd, id) {
                     dispatched += count;
                 }
             }
@@ -128,7 +128,7 @@ impl<D> InnerBackend<D> {
             for event in events.iter().take(nevents) {
                 let id = InnerClientId::from_u64(event.udata() as u64);
                 // remove the cb while we call it, to gracefully handle reentrancy
-                if let Ok(count) = self.dispatch_events_for(data, id) {
+                if let Ok(count) = self.dispatch_events_for(data, poll_fd, id) {
                     dispatched += count;
                 }
             }
@@ -142,6 +142,7 @@ impl<D> InnerBackend<D> {
     pub(crate) fn dispatch_events_for(
         &self,
         data: &mut D,
+        poll_fd: BorrowedFd<'_>,
         client_id: InnerClientId,
     ) -> std::io::Result<usize> {
         let mut dispatched = 0;
@@ -160,7 +161,36 @@ impl<D> InnerBackend<D> {
                                 return Err(e);
                             }
                         }
-                        Err(e) => return Err(e),
+                        Err(e) => {
+                            #[cfg(any(target_os = "linux", target_os = "android"))]
+                            {
+                                epoll::delete(poll_fd, client)?;
+                            }
+
+                            #[cfg(any(
+                                target_os = "dragonfly",
+                                target_os = "freebsd",
+                                target_os = "netbsd",
+                                target_os = "openbsd",
+                                target_os = "macos"
+                            ))]
+                            {
+                                use rustix::event::kqueue::*;
+                                use std::os::unix::io::{AsFd, AsRawFd};
+
+                                let evt = Event::new(
+                                    EventFilter::Read(client.as_fd().as_raw_fd()),
+                                    EventFlags::DELETE,
+                                    client_id.as_u64() as isize,
+                                );
+
+                                let mut events = Vec::new();
+                                unsafe {
+                                    kevent(poll_fd, &[evt], &mut events, None).map(|_| ())?;
+                                }
+                            }
+                            return Err(e);
+                        }
                     };
                     dispatched += 1;
                     if same_interface(object.interface, &WL_DISPLAY_INTERFACE) {