Skip to content

perf: skip construction for unchanged stuff #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnTitor merged 1 commit into from
Apr 25, 2026
+23 −31
Merged

perf: skip construction for unchanged stuff #905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 23 additions & 31 deletions notify/src/poll.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,23 @@ mod data {
self.follow_symlinks,
false,
) {
let old_path_data = self
.all_path_data
.insert(path.clone(), new_path_data.clone());

// emit event
let event = PathData::compare_to_event(
reported_path(&self.root, &self.requested_root, &path),
old_path_data.as_ref(),
Some(&new_path_data),
);
if let Some(event) = event {
let event_kind = if let Some(old_path_data) = self.all_path_data.get_mut(&path) {
let event_kind =
PathData::compare_to_kind(Some(&*old_path_data), Some(&new_path_data));
*old_path_data = new_path_data;
event_kind
} else {
let event_kind = PathData::compare_to_kind(None, Some(&new_path_data));
self.all_path_data.insert(path.clone(), new_path_data);
Copy link
Copy Markdown
Member Author

@JohnTitor JohnTitor Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main win comes from not calling this clone unconditionally.

event_kind
};

if let Some(event_kind) = event_kind {
let event = Event::new(event_kind).add_path(reported_path(
&self.root,
&self.requested_root,
&path,
));
data_builder.emitter.emit_ok(event);
}
}
Expand All @@ -276,13 +282,12 @@ mod data {
for path in disappeared_paths {
let old_path_data = self.all_path_data.remove(&path);

// emit event
let event = PathData::compare_to_event(
reported_path(&self.root, &self.requested_root, &path),
old_path_data.as_ref(),
None,
);
if let Some(event) = event {
if let Some(event_kind) = PathData::compare_to_kind(old_path_data.as_ref(), None) {
let event = Event::new(event_kind).add_path(reported_path(
&self.root,
&self.requested_root,
&path,
));
data_builder.emitter.emit_ok(event);
}
}
Expand Down Expand Up @@ -410,19 +415,6 @@ mod data {
}
}

/// Get [`Event`] by compare two optional [`PathData`].
fn compare_to_event<P>(
path: P,
old: Option<&PathData>,
new: Option<&PathData>,
) -> Option<Event>
where
P: Into<PathBuf>,
{
Self::compare_to_kind(old, new)
.map(|event_kind| Event::new(event_kind).add_path(path.into()))
}

fn compare_to_kind(old: Option<&PathData>, new: Option<&PathData>) -> Option<EventKind> {
match (old, new) {
(Some(old), Some(new)) => {
Expand Down