monolith

public

Star0

Fork 0

Watch0

143 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `d2817bc6c3eb`

tarball

atagen <boss@atagen.co>2026-10-19 06:13 UTC

1 file changed+15-1

import: join the worker before exiting

The buffer-import worker could drop the last Arc<Shared> after main returned, calling vkDestroyDevice concurrently with NVIDIA's exit handlers. glibc then aborted in pthread_cond_destroy with free(): invalid size on most nested quits.

Modified file: crates/monolith/src/import.rs+15 additions−1 deletions@@ -27,6 +27,7 @@ const OFFLOAD_BYTES: i64 = 512 * 1024;
 
 pub struct Imports {
     jobs: mpsc::Sender<Job>,
+    worker: Option<std::thread::JoinHandle<()>>,
     dmabufs: HashMap<WeakDmabuf, Waiters>,
     shm: HashMap<ObjectId, Waiters>,
 }
@@ -50,6 +51,18 @@ impl Blocker for ImportBlocker {
     }
 }
 
+impl Drop for Imports {
+    // The worker may hold the last reference to the Vulkan device. Left
+    // running, it destroys the device while NVIDIA's exit handlers tear down
+    // the same driver state on the main thread, and glibc aborts.
+    fn drop(&mut self) {
+        self.jobs = mpsc::channel().0;
+        if let Some(worker) = self.worker.take() {
+            let _ = worker.join();
+        }
+    }
+}
+
 enum Job {
     Dmabuf(Dmabuf),
     Shm(WlBuffer, Option<Rectangle<i32, Buffer>>),
@@ -68,7 +81,7 @@ impl Imports {
     ) -> std::io::Result<Self> {
         let (done, results) = channel::<Done>();
         let (jobs, queue) = mpsc::channel::<Job>();
-        std::thread::Builder::new()
+        let worker = std::thread::Builder::new()
             .name("buffer-import".into())
             .spawn(move || {
                 for job in queue {
@@ -96,6 +109,7 @@ impl Imports {
             .map_err(|e| std::io::Error::other(e.to_string()))?;
         Ok(Self {
             jobs,
+            worker: Some(worker),
             dmabufs: HashMap::new(),
             shm: HashMap::new(),
         })

monolith

Commit d2817bc6c3eb

Commit `d2817bc6c3eb`