[[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",
"lsp-types",
"mbe",
"mimalloc",
+ "num_cpus",
"oorandom",
"parking_lot",
"proc_macro_api",
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},
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,
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 {
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"
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))
}
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(),