monolith

public

Star0

Fork 0

Watch0

99 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `0e6ab4933125`

tarball

atagen <boss@atagen.co>2026-10-17 05:09 UTC

3 files changed+51-19

monolith: stop waiting on imports when the import worker is gone

A failed send to a dead worker was dropped, leaving every later commit of that buffer behind a blocker nobody would release, so clients froze. Imports now fall back to the main thread. X11 configure failures are logged too, since a silent one leaves a window at a geometry the layout never chose.

Modified file: crates/monolith/src/import.rs+33 additions−13 deletions@@ -7,6 +7,7 @@
 use crate::state::State;
 use monolith_render_vk::{DmabufImporter, ShmStager, StagedShm, VulkanTexture};
 use smithay::backend::allocator::dmabuf::{Dmabuf, WeakDmabuf};
+use smithay::backend::renderer::ImportDma;
 use smithay::reexports::calloop::LoopHandle;
 use smithay::reexports::calloop::channel::{Event, channel};
 use smithay::reexports::wayland_server::backend::ObjectId;
@@ -100,12 +101,22 @@ impl Imports {
         })
     }
 
-    fn start(&mut self, buffer: &Dmabuf) -> &mut Waiters {
-        let jobs = &self.jobs;
-        self.dmabufs.entry(buffer.weak()).or_insert_with(|| {
-            let _ = jobs.send(Job::Dmabuf(buffer.clone()));
-            Waiters::default()
-        })
+    /// None once the worker is gone, when the caller imports on the main
+    /// thread instead of waiting on a job nobody will finish.
+    fn start(&mut self, buffer: &Dmabuf) -> Option<&mut Waiters> {
+        let key = buffer.weak();
+        if !self.dmabufs.contains_key(&key) && !self.send(Job::Dmabuf(buffer.clone())) {
+            return None;
+        }
+        Some(self.dmabufs.entry(key).or_default())
+    }
+
+    fn send(&self, job: Job) -> bool {
+        let sent = self.jobs.send(job).is_ok();
+        if !sent {
+            tracing::warn!("buffer import worker is gone");
+        }
+        sent
     }
 }
 
@@ -116,7 +127,15 @@ impl State {
             let _ = notifier.successful::<State>();
             return;
         }
-        self.services.imports.start(buffer).notifiers.push(notifier);
+        match self.services.imports.start(buffer) {
+            Some(waiters) => waiters.notifiers.push(notifier),
+            None => match self.renderer.import_dmabuf(buffer, None) {
+                Ok(_) => {
+                    let _ = notifier.successful::<State>();
+                }
+                Err(_) => notifier.failed(),
+            },
+        }
     }
 
     /// A blocker for a commit whose dmabuf the renderer has not imported yet.
@@ -124,7 +143,7 @@ impl State {
         if self.renderer.has_dmabuf(buffer) {
             return None;
         }
-        let waiters = self.services.imports.start(buffer);
+        let waiters = self.services.imports.start(buffer)?;
         waiters.clients.push(client);
         Some(ImportBlocker(waiters.done.clone()))
     }
@@ -150,11 +169,12 @@ impl State {
             return None;
         }
         let imports = &mut self.services.imports;
-        let jobs = &imports.jobs;
-        let waiters = imports.shm.entry(buffer.id()).or_insert_with(|| {
-            let _ = jobs.send(Job::Shm(buffer.clone(), region));
-            Waiters::default()
-        });
+        if !imports.shm.contains_key(&buffer.id())
+            && !imports.send(Job::Shm(buffer.clone(), region))
+        {
+            return None;
+        }
+        let waiters = imports.shm.entry(buffer.id()).or_default();
         waiters.clients.push(client);
         Some(ImportBlocker(waiters.done.clone()))
     }

Modified file: crates/monolith/src/wm.rs+7 additions−3 deletions@@ -210,9 +210,13 @@ pub fn configure(window: &Window, rect: Rect, kind: Kind, maximized: bool) -> bo
     }
     let (x0, y0) = (x as i32, y as i32);
     if let Some(x) = window.x11_surface() {
-        let _ = x.configure(Rectangle::new((x0, y0).into(), (w, h).into()));
-        let _ = x.set_fullscreen(kind == Kind::Fullscreen);
-        let _ = x.set_maximized(maximized && kind == Kind::Tiled);
+        let geo = Rectangle::new((x0, y0).into(), (w, h).into());
+        crate::xwayland::logged("configure", x.configure(geo));
+        crate::xwayland::logged("fullscreen", x.set_fullscreen(kind == Kind::Fullscreen));
+        crate::xwayland::logged(
+            "maximize",
+            x.set_maximized(maximized && kind == Kind::Tiled),
+        );
     }
     if let Some(t) = window.toplevel() {
         t.with_pending_state(|s| {

Modified file: crates/monolith/src/xwayland.rs+11 additions−3 deletions@@ -259,7 +259,7 @@ impl XwmHandler for State {
     fn unmapped_window(&mut self, _xwm: XwmId, window: X11Surface) {
         self.forget_x11(&window);
         if !window.is_override_redirect() {
-            let _ = window.set_mapped(false);
+            logged("unmap", window.set_mapped(false));
         }
     }
 
@@ -278,7 +278,7 @@ impl XwmHandler for State {
         _reorder: Option<Reorder>,
     ) {
         if self.x11_window_id(&window).is_some() {
-            let _ = window.configure(None);
+            logged("configure", window.configure(None));
             return;
         }
         let mut geo = window.geometry();
@@ -286,7 +286,7 @@ impl XwmHandler for State {
         geo.loc.y = y.unwrap_or(geo.loc.y);
         geo.size.w = w.map_or(geo.size.w, |w| w as i32);
         geo.size.h = h.map_or(geo.size.h, |h| h as i32);
-        let _ = window.configure(geo);
+        logged("configure", window.configure(geo));
     }
 
     fn configure_notify(
@@ -397,3 +397,11 @@ impl State {
         }
     }
 }
+
+/// X11 requests fail when the window is already gone, which is routine, but
+/// a failure on a live window means it never got the geometry we chose.
+pub fn logged<E: std::fmt::Display>(what: &str, result: Result<(), E>) {
+    if let Err(e) = result {
+        tracing::debug!("X11 {what} failed: {e}");
+    }
+}

monolith

Commit 0e6ab4933125

Commit `0e6ab4933125`