mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-09 05:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

working_copy: split up tracing scope a bit

Browse source 
Now that we process the outputs from the file system traversal by
reading from channels, we can separate the processing from the file
system traversal. When the working copy is unchanged, processing tree
entries and deleted files takes practically no time, but processing
file states and present files takes significant time.
This commit is contained in:
Martin von Zweigbergk 2023-08-03 23:07:11 -07:00 committed by Martin von Zweigbergk
parent b27b686b4e
commit d06f51a88c
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/src/working_copy.rs
View file

@ -656,11 +656,11 @@ impl TreeState {
disk_dir: self.working_copy_path.clone(),
git_ignore: base_ignores,
};
trace_span!("traverse filesystem").in_scope(|| -> Result<(), SnapshotError> {
let (tree_entries_tx, tree_entries_rx) = channel();
let (file_states_tx, file_states_rx) = channel();
let (present_files_tx, present_files_rx) = channel();
let (tree_entries_tx, tree_entries_rx) = channel();
let (file_states_tx, file_states_rx) = channel();
let (present_files_tx, present_files_rx) = channel();
trace_span!("traverse filesystem").in_scope(|| -> Result<(), SnapshotError> {
self.visit_directory(
&matcher,
&current_tree,
@ -669,25 +669,30 @@ impl TreeState {
present_files_tx,
directory_to_visit,
progress,
)?;
)
})?;
trace_span!("process tree entries").in_scope(|| {
while let Ok((path, tree_value)) = tree_entries_rx.recv() {
tree_builder.set(path, tree_value);
}
});
trace_span!("process file states").in_scope(|| {
while let Ok((path, file_state)) = file_states_rx.recv() {
self.file_states.insert(path, file_state);
}
});
trace_span!("process present files").in_scope(|| {
while let Ok(path) = present_files_rx.recv() {
deleted_files.remove(&path);
}
Ok(())
})?;
for file in &deleted_files {
self.file_states.remove(file);
tree_builder.remove(file.clone());
}
});
trace_span!("process deleted files").in_scope(|| {
for file in &deleted_files {
self.file_states.remove(file);
tree_builder.remove(file.clone());
}
});
let has_changes = tree_builder.has_overrides();
self.tree_id = tree_builder.write_tree();
self.watchman_clock = watchman_clock;