Skip to content

Commit 07e6f9d

Browse files
VeykrilVeykril
committed
internal: Load VFS config changes in parallel
1 parent 5ac2ad4 commit 07e6f9d

File tree

7 files changed

+129
-81
lines changed

7 files changed

+129
-81
lines changed

‎src/tools/rust-analyzer/Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,6 +2332,7 @@ dependencies = [
23322332
"crossbeam-channel",
23332333
"notify",
23342334
"paths",
2335+
"rayon",
23352336
"stdx",
23362337
"tracing",
23372338
"vfs",

‎src/tools/rust-analyzer/crates/load-cargo/src/lib.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ use project_model::{
1919
CargoConfig, ManifestPath, PackageRoot, ProjectManifest, ProjectWorkspace, ProjectWorkspaceKind,
2020
};
2121
use span::Span;
22-
use vfs::{file_set::FileSetConfig, loader::Handle, AbsPath, AbsPathBuf, VfsPath};
22+
use vfs::{
23+
file_set::FileSetConfig,
24+
loader::{Handle, LoadingProgress},
25+
AbsPath, AbsPathBuf, VfsPath,
26+
};
2327

2428
pub struct LoadCargoConfig {
2529
pub load_out_dirs_from_check: bool,
@@ -409,8 +413,8 @@ fn load_crate_graph(
409413
// wait until Vfs has loaded all roots
410414
for task in receiver {
411415
match task {
412-
vfs::loader::Message::Progress { n_done, n_total, .. } => {
413-
if n_done == Some(n_total) {
416+
vfs::loader::Message::Progress { n_done, .. } => {
417+
if n_done == LoadingProgress::Finished {
414418
break;
415419
}
416420
}

‎src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use lsp_server::{Connection, Notification, Request};
1515
use lsp_types::{notification::Notification as _, TextDocumentIdentifier};
1616
use stdx::thread::ThreadIntent;
1717
use tracing::{error, span, Level};
18-
use vfs::{AbsPathBuf, FileId};
18+
use vfs::{loader::LoadingProgress, AbsPathBuf, FileId};
1919

2020
use crate::{
2121
config::Config,
@@ -772,12 +772,11 @@ impl GlobalState {
772772
let _p = tracing::info_span!("GlobalState::handle_vfs_mgs/progress").entered();
773773
always!(config_version <= self.vfs_config_version);
774774

775-
let state = match n_done {
776-
None => Progress::Begin,
777-
Some(done) if done == n_total => Progress::End,
778-
Some(_) => Progress::Report,
775+
let (n_done, state) = match n_done {
776+
LoadingProgress::Started => (0, Progress::Begin),
777+
LoadingProgress::Progress(n_done) => (n_done.min(n_total), Progress::Report),
778+
LoadingProgress::Finished => (n_total, Progress::End),
779779
};
780-
let n_done = n_done.unwrap_or_default();
781780

782781
self.vfs_progress_config_version = config_version;
783782
self.vfs_progress_n_total = n_total;

‎src/tools/rust-analyzer/crates/rust-analyzer/tests/slow-tests/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ version = \"0.0.0\"
909909

910910
fn out_dirs_check_impl(root_contains_symlink: bool) {
911911
if skip_slow_tests() {
912-
// return;
912+
return;
913913
}
914914

915915
let mut server = Project::with_fixture(

‎src/tools/rust-analyzer/crates/vfs-notify/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ tracing.workspace = true
1616
walkdir = "2.3.2"
1717
crossbeam-channel = "0.5.5"
1818
notify = "6.1.1"
19+
rayon = "1.10.0"
1920

2021
stdx.workspace = true
2122
vfs.workspace = true
2223
paths.workspace = true
2324

2425
[lints]
25-
workspace = true
26+
workspace = true

‎src/tools/rust-analyzer/crates/vfs-notify/src/lib.rs‎

Lines changed: 104 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
use std::{
1111
fs,
1212
path::{Component, Path},
13+
sync::atomic::AtomicUsize,
1314
};
1415

1516
use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
16-
use notify::{Config, RecommendedWatcher, RecursiveMode, Watcher};
17+
use notify::{Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
1718
use paths::{AbsPath, AbsPathBuf, Utf8PathBuf};
18-
use vfs::loader;
19+
use rayon::iter::{IndexedParallelIterator as _, IntoParallelIterator as _, ParallelIterator};
20+
use vfs::loader::{self, LoadingProgress};
1921
use walkdir::WalkDir;
2022

2123
#[derive(Debug)]
@@ -104,35 +106,61 @@ impl NotifyActor {
104106
let config_version = config.version;
105107

106108
let n_total = config.load.len();
107-
self.send(loader::Message::Progress {
109+
self.watched_entries.clear();
110+
111+
let send = |msg| (self.sender)(msg);
112+
send(loader::Message::Progress {
108113
n_total,
109-
n_done: None,
114+
n_done: LoadingProgress::Started,
110115
config_version,
111116
dir: None,
112117
});
113118

114-
self.watched_entries.clear();
115-
116-
for (i, entry) in config.load.into_iter().enumerate() {
117-
let watch = config.watch.contains(&i);
118-
if watch {
119-
self.watched_entries.push(entry.clone());
119+
let (entry_tx, entry_rx) = unbounded();
120+
let (watch_tx, watch_rx) = unbounded();
121+
let processed = AtomicUsize::new(0);
122+
config.load.into_par_iter().enumerate().for_each(move |(i, entry)| {
123+
let do_watch = config.watch.contains(&i);
124+
if do_watch {
125+
_ = entry_tx.send(entry.clone());
120126
}
121-
let files =
122-
self.load_entry(entry, watch, |file| loader::Message::Progress {
123-
n_total,
124-
n_done: Some(i),
125-
dir: Some(file),
126-
config_version,
127-
});
128-
self.send(loader::Message::Loaded { files });
129-
self.send(loader::Message::Progress {
127+
let files = Self::load_entry(
128+
|f| _ = watch_tx.send(f.to_owned()),
129+
entry,
130+
do_watch,
131+
|file| {
132+
send(loader::Message::Progress {
133+
n_total,
134+
n_done: LoadingProgress::Progress(
135+
processed.load(std::sync::atomic::Ordering::Relaxed),
136+
),
137+
dir: Some(file),
138+
config_version,
139+
})
140+
},
141+
);
142+
send(loader::Message::Loaded { files });
143+
send(loader::Message::Progress {
130144
n_total,
131-
n_done: Some(i + 1),
145+
n_done: LoadingProgress::Progress(
146+
processed.fetch_add(1, std::sync::atomic::Ordering::AcqRel) + 1,
147+
),
132148
config_version,
133149
dir: None,
134150
});
151+
});
152+
for path in watch_rx {
153+
self.watch(&path);
154+
}
155+
for entry in entry_rx {
156+
self.watched_entries.push(entry);
135157
}
158+
self.send(loader::Message::Progress {
159+
n_total,
160+
n_done: LoadingProgress::Finished,
161+
config_version,
162+
dir: None,
163+
});
136164
}
137165
Message::Invalidate(path) => {
138166
let contents = read(path.as_path());
@@ -142,60 +170,67 @@ impl NotifyActor {
142170
},
143171
Event::NotifyEvent(event) => {
144172
if let Some(event) = log_notify_error(event) {
145-
let files = event
146-
.paths
147-
.into_iter()
148-
.filter_map(|path| {
149-
Some(
150-
AbsPathBuf::try_from(Utf8PathBuf::from_path_buf(path).ok()?)
173+
if let EventKind::Create(_) | EventKind::Modify(_) | EventKind::Remove(_) =
174+
event.kind
175+
{
176+
let files = event
177+
.paths
178+
.into_iter()
179+
.filter_map(|path| {
180+
Some(
181+
AbsPathBuf::try_from(
182+
Utf8PathBuf::from_path_buf(path).ok()?,
183+
)
151184
.expect("path is absolute"),
152-
)
153-
})
154-
.filter_map(|path| {
155-
let meta = fs::metadata(&path).ok()?;
156-
if meta.file_type().is_dir()
157-
&& self
185+
)
186+
})
187+
.filter_map(|path| {
188+
let meta = fs::metadata(&path).ok()?;
189+
if meta.file_type().is_dir()
190+
&& self
191+
.watched_entries
192+
.iter()
193+
.any(|entry| entry.contains_dir(&path))
194+
{
195+
self.watch(path.as_ref());
196+
return None;
197+
}
198+
199+
if !meta.file_type().is_file() {
200+
return None;
201+
}
202+
if !self
158203
.watched_entries
159204
.iter()
160-
.any(|entry| entry.contains_dir(&path))
161-
{
162-
self.watch(path);
163-
return None;
164-
}
165-
166-
if !meta.file_type().is_file() {
167-
return None;
168-
}
169-
if !self
170-
.watched_entries
171-
.iter()
172-
.any(|entry| entry.contains_file(&path))
173-
{
174-
return None;
175-
}
176-
177-
let contents = read(&path);
178-
Some((path, contents))
179-
})
180-
.collect();
181-
self.send(loader::Message::Changed { files });
205+
.any(|entry| entry.contains_file(&path))
206+
{
207+
return None;
208+
}
209+
210+
let contents = read(&path);
211+
Some((path, contents))
212+
})
213+
.collect();
214+
self.send(loader::Message::Changed { files });
215+
}
182216
}
183217
}
184218
}
185219
}
186220
}
221+
187222
fn load_entry(
188-
&mut self,
223+
mut watch: impl FnMut(&Path),
189224
entry: loader::Entry,
190-
watch: bool,
191-
make_message: impl Fn(AbsPathBuf) -> loader::Message,
225+
do_watch: bool,
226+
send_message: impl Fn(AbsPathBuf),
192227
) -> Vec<(AbsPathBuf, Option<Vec<u8>>)> {
193228
match entry {
194229
loader::Entry::Files(files) => files
195230
.into_iter()
196231
.map(|file| {
197-
if watch {
198-
self.watch(file.clone());
232+
if do_watch {
233+
watch(file.as_ref());
199234
}
200235
let contents = read(file.as_path());
201236
(file, contents)
@@ -205,15 +240,15 @@ impl NotifyActor {
205240
let mut res = Vec::new();
206241

207242
for root in &dirs.include {
208-
self.send(make_message(root.clone()));
243+
send_message(root.clone());
209244
let walkdir =
210245
WalkDir::new(root).follow_links(true).into_iter().filter_entry(|entry| {
211246
if !entry.file_type().is_dir() {
212247
return true;
213248
}
214249
let path = entry.path();
215250

216-
if path_is_parent_symlink(path) {
251+
if path_might_be_cyclic(path) {
217252
return false;
218253
}
219254

@@ -230,10 +265,10 @@ impl NotifyActor {
230265
)
231266
.ok()?;
232267
if depth < 2 && is_dir {
233-
self.send(make_message(abs_path.clone()));
268+
send_message(abs_path.clone());
234269
}
235-
if is_dir && watch {
236-
self.watch(abs_path.clone());
270+
if is_dir && do_watch {
271+
watch(abs_path.as_ref());
237272
}
238273
if !is_file {
239274
return None;
@@ -255,12 +290,13 @@ impl NotifyActor {
255290
}
256291
}
257292

258-
fn watch(&mut self, path: AbsPathBuf) {
293+
fn watch(&mut self, path: &Path) {
259294
if let Some((watcher, _)) = &mut self.watcher {
260-
log_notify_error(watcher.watch(path.as_ref(), RecursiveMode::NonRecursive));
295+
log_notify_error(watcher.watch(path, RecursiveMode::NonRecursive));
261296
}
262297
}
263-
fn send(&mut self, msg: loader::Message) {
298+
299+
fn send(&self, msg: loader::Message) {
264300
(self.sender)(msg);
265301
}
266302
}
@@ -279,7 +315,7 @@ fn log_notify_error<T>(res: notify::Result<T>) -> Option<T> {
279315
/// heuristic is not sufficient to catch all symlink cycles (it's
280316
/// possible to construct cycle using two or more symlinks), but it
281317
/// catches common cases.
282-
fn path_is_parent_symlink(path: &Path) -> bool {
318+
fn path_might_be_cyclic(path: &Path) -> bool {
283319
let Ok(destination) = std::fs::read_link(path) else {
284320
return false;
285321
};

‎src/tools/rust-analyzer/crates/vfs/src/loader.rs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ pub struct Config {
4343
pub watch: Vec<usize>,
4444
}
4545

46+
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
47+
pub enum LoadingProgress {
48+
Started,
49+
Progress(usize),
50+
Finished,
51+
}
52+
4653
/// Message about an action taken by a [`Handle`].
4754
pub enum Message {
4855
/// Indicate a gradual progress.
@@ -52,7 +59,7 @@ pub enum Message {
5259
/// The total files to be loaded.
5360
n_total: usize,
5461
/// The files that have been loaded successfully.
55-
n_done: Option<usize>,
62+
n_done: LoadingProgress,
5663
/// The dir being loaded, `None` if its for a file.
5764
dir: Option<AbsPathBuf>,
5865
/// The [`Config`] version.
@@ -65,7 +72,7 @@ pub enum Message {
6572
}
6673

6774
/// Type that will receive [`Messages`](Message) from a [`Handle`].
68-
pub type Sender = Box<dyn Fn(Message) + Send>;
75+
pub type Sender = Box<dyn Fn(Message) + Send + Sync>;
6976

7077
/// Interface for reading and watching files.
7178
pub trait Handle: fmt::Debug {

0 commit comments

Comments
 (0)