Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

fs: Make `OsWatcher` own a `BackgroundExecutor` (#65700)

Finn Evers322cd509dccc
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 4d0d185f5ae..2a1ef39245b 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -928,6 +928,9 @@ pub struct OsWatcher {
event_tx: async_channel::Sender<notify::Result<notify::Event>>,
_dispatch_task: Task<()>,
diagnostics: Arc<diagnostics::DiagnosticRecorder>,
+ // Closing the event channel can wake the dispatch task. Keep its scheduler
+ // alive through channel and task teardown, even when our owner drops first.
+ _executor: BackgroundExecutor,
}
impl OsWatcher {
@@ -968,6 +971,7 @@ impl OsWatcher {
event_tx,
_dispatch_task: dispatch_task,
diagnostics: Default::default(),
+ _executor: executor,
})
}
@@ -1449,6 +1453,21 @@ mod tests {
}
}
+ #[test]
+ fn watcher_retains_scheduler_until_teardown() {
+ let dispatcher = Arc::new(gpui::TestDispatcher::new(0));
+ let scheduler = Arc::downgrade(dispatcher.scheduler());
+ let executor = BackgroundExecutor::new(dispatcher.clone());
+ let watcher = OsWatcher::new(OsWatcherKind::Native, executor.clone());
+ executor.run_until_parked();
+ drop(executor);
+
+ drop(dispatcher);
+ assert!(scheduler.upgrade().is_some());
+ drop(watcher);
+ assert!(scheduler.upgrade().is_none());
+ }
+
fn test_os_watcher(
kind: OsWatcherKind,
backend: Option<Arc<Mutex<FakeWatchBackend>>>,
@@ -1474,6 +1493,7 @@ mod tests {
event_tx,
_dispatch_task: Task::ready(()),
diagnostics: Default::default(),
+ _executor: BackgroundExecutor::new(Arc::new(gpui::TestDispatcher::new(0))),
}
}