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: Pre-filter the event kind before acquiring global lock and cloning callback handlers (#55683)

Josh Robson Chase7ba7b4b981b5
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 6db36992dec..f99d5d0b70e 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -1,4 +1,4 @@
-use notify::EventKind;
+use notify::{Event, EventKind};
use parking_lot::Mutex;
use std::{
collections::{BTreeMap, HashMap},
@@ -458,6 +458,16 @@ fn handle_poll_event(event: Result<notify::Event, notify::Error>) {
}
fn handle_event(mode: WatcherMode, event: Result<notify::Event, notify::Error>) {
+ if matches!(
+ event,
+ Ok(Event {
+ kind: EventKind::Access(_),
+ ..
+ })
+ ) {
+ return;
+ }
+
log::trace!("global handle event for {mode:?}: {event:?}");
let callbacks = {
@@ -472,9 +482,6 @@ fn handle_event(mode: WatcherMode, event: Result<notify::Event, notify::Error>)
match event {
Ok(event) => {
- if matches!(event.kind, EventKind::Access(_)) {
- return;
- }
for callback in callbacks {
callback(Ok(&event));
}