Unnamed repository; edit this file 'description' to name the repository.
cleanup + detect num cpus
| -rw-r--r-- | Cargo.lock | 5 | ||||
| -rw-r--r-- | crates/ide/src/lib.rs | 9 | ||||
| -rw-r--r-- | crates/ide/src/prime_caches.rs | 23 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/cli/load_cargo.rs | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 11 |
6 files changed, 13 insertions, 38 deletions
diff --git a/Cargo.lock b/Cargo.lock index 915da5d283..2648768553 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1013,9 +1013,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -1349,6 +1349,7 @@ dependencies = [ "lsp-types", "mbe", "mimalloc", + "num_cpus", "oorandom", "parking_lot", "proc_macro_api", diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 5c872fe9c7..4028b0bc72 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs @@ -87,7 +87,7 @@ pub use crate::{ moniker::{MonikerKind, MonikerResult, PackageInformation}, move_item::Direction, navigation_target::NavigationTarget, - prime_caches::{ParallelPrimeCachesProgress, PrimeCachesProgress}, + prime_caches::ParallelPrimeCachesProgress, references::ReferenceSearchResult, rename::RenameError, runnables::{Runnable, RunnableKind, TestId}, @@ -244,13 +244,6 @@ impl Analysis { self.with_db(|db| status::status(&*db, file_id)) } - pub fn prime_caches<F>(&self, cb: F) -> Cancellable<()> - where - F: Fn(PrimeCachesProgress) + Sync + std::panic::UnwindSafe, - { - self.with_db(move |db| prime_caches::prime_caches(db, &cb)) - } - pub fn parallel_prime_caches<F>(&self, num_worker_threads: u8, cb: F) -> Cancellable<()> where F: Fn(ParallelPrimeCachesProgress) + Sync + std::panic::UnwindSafe, diff --git a/crates/ide/src/prime_caches.rs b/crates/ide/src/prime_caches.rs index 3998e721d1..b3413c0326 100644 --- a/crates/ide/src/prime_caches.rs +++ b/crates/ide/src/prime_caches.rs @@ -16,29 +16,6 @@ use rustc_hash::FxHashSet; use crate::RootDatabase; -/// We started indexing a crate. -#[derive(Debug)] -pub struct PrimeCachesProgress { - pub on_crate: String, - pub n_done: usize, - pub n_total: usize, -} - -pub(crate) fn prime_caches(db: &RootDatabase, cb: &(dyn Fn(PrimeCachesProgress) + Sync)) { - let _p = profile::span("prime_caches"); - let graph = db.crate_graph(); - let to_prime = compute_crates_to_prime(db, &graph); - - let n_total = to_prime.len(); - for (n_done, &crate_id) in to_prime.iter().enumerate() { - let crate_name = graph[crate_id].display_name.as_deref().unwrap_or_default().to_string(); - - cb(PrimeCachesProgress { on_crate: crate_name, n_done, n_total }); - // This also computes the DefMap - db.import_map(crate_id); - } -} - /// We're indexing many crates. #[derive(Debug)] pub struct ParallelPrimeCachesProgress { diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 0ab866a707..014001397d 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -31,6 +31,7 @@ serde = { version = "1.0.106", features = ["derive"] } serde_json = { version = "1.0.48", features = ["preserve_order"] } threadpool = "1.7.1" rayon = "1.5" +num_cpus = "1.13.1" mimalloc = { version = "0.1.19", default-features = false, optional = true } lsp-server = "0.5.1" tracing = "0.1" diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs index 19ce86e3ff..490aef50f3 100644 --- a/crates/rust-analyzer/src/cli/load_cargo.rs +++ b/crates/rust-analyzer/src/cli/load_cargo.rs @@ -88,7 +88,7 @@ pub fn load_workspace( load_crate_graph(crate_graph, project_folders.source_root_config, &mut vfs, &receiver); if load_config.prefill_caches { - host.analysis().prime_caches(|_| {})?; + host.analysis().parallel_prime_caches(1, |_| {})?; } Ok((host, vfs, proc_macro_client)) } diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index c0736ede09..3d17ee4513 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -509,10 +509,13 @@ impl GlobalState { let analysis = self.snapshot().analysis; move |sender| { sender.send(Task::PrimeCaches(PrimeCachesProgress::Begin)).unwrap(); - let res = analysis.parallel_prime_caches(32, |progress| { - let report = PrimeCachesProgress::Report(progress); - sender.send(Task::PrimeCaches(report)).unwrap(); - }); + let res = analysis.parallel_prime_caches( + num_cpus::get_physical().try_into().unwrap_or(u8::MAX), + |progress| { + let report = PrimeCachesProgress::Report(progress); + sender.send(Task::PrimeCaches(report)).unwrap(); + }, + ); sender .send(Task::PrimeCaches(PrimeCachesProgress::End { cancelled: res.is_err(), |