aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_prof/Cargo.toml6
-rw-r--r--crates/ra_prof/src/lib.rs6
-rw-r--r--crates/ra_prof/src/memory_usage.rs10
-rw-r--r--crates/rust-analyzer/Cargo.toml1
-rw-r--r--crates/rust-analyzer/src/bin/args.rs4
5 files changed, 4 insertions, 23 deletions
diff --git a/crates/ra_prof/Cargo.toml b/crates/ra_prof/Cargo.toml
index 2e60858f1..84d895317 100644
--- a/crates/ra_prof/Cargo.toml
+++ b/crates/ra_prof/Cargo.toml
@@ -17,16 +17,10 @@ mimalloc = { version = "0.1.19", default-features = false, optional = true }
17cfg-if = "0.1.10" 17cfg-if = "0.1.10"
18libc = "0.2.73" 18libc = "0.2.73"
19 19
20[target.'cfg(not(target_env = "msvc"))'.dependencies]
21jemallocator = { version = "0.3.2", optional = true }
22jemalloc-ctl = { version = "0.3.3", optional = true }
23
24[features] 20[features]
25jemalloc = [ "jemallocator", "jemalloc-ctl" ]
26cpu_profiler = [] 21cpu_profiler = []
27 22
28# Uncomment to enable for the whole crate graph 23# Uncomment to enable for the whole crate graph
29# default = [ "backtrace" ] 24# default = [ "backtrace" ]
30# default = [ "jemalloc" ]
31# default = [ "mimalloc" ] 25# default = [ "mimalloc" ]
32# default = [ "cpu_profiler" ] 26# default = [ "cpu_profiler" ]
diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index b54531b4e..a5b408a1d 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -13,12 +13,6 @@ pub use crate::{
13 memory_usage::{Bytes, MemoryUsage}, 13 memory_usage::{Bytes, MemoryUsage},
14}; 14};
15 15
16// We use jemalloc mainly to get heap usage statistics, actual performance
17// difference is not measures.
18#[cfg(all(feature = "jemalloc", not(target_env = "msvc")))]
19#[global_allocator]
20static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
21
22#[cfg(all(feature = "mimalloc"))] 16#[cfg(all(feature = "mimalloc"))]
23#[global_allocator] 17#[global_allocator]
24static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; 18static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs
index b1858b06f..ee79ec3ee 100644
--- a/crates/ra_prof/src/memory_usage.rs
+++ b/crates/ra_prof/src/memory_usage.rs
@@ -1,7 +1,7 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2use std::fmt;
2 3
3use cfg_if::cfg_if; 4use cfg_if::cfg_if;
4use std::fmt;
5 5
6pub struct MemoryUsage { 6pub struct MemoryUsage {
7 pub allocated: Bytes, 7 pub allocated: Bytes,
@@ -11,13 +11,7 @@ pub struct MemoryUsage {
11impl MemoryUsage { 11impl MemoryUsage {
12 pub fn current() -> MemoryUsage { 12 pub fn current() -> MemoryUsage {
13 cfg_if! { 13 cfg_if! {
14 if #[cfg(all(feature = "jemalloc", not(target_env = "msvc")))] { 14 if #[cfg(target_os = "linux")] {
15 jemalloc_ctl::epoch::advance().unwrap();
16 MemoryUsage {
17 allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap()),
18 resident: Bytes(jemalloc_ctl::stats::resident::read().unwrap()),
19 }
20 } else if #[cfg(target_os = "linux")] {
21 // Note: This is incredibly slow. 15 // Note: This is incredibly slow.
22 let alloc = unsafe { libc::mallinfo() }.uordblks as u32 as usize; 16 let alloc = unsafe { libc::mallinfo() }.uordblks as u32 as usize;
23 MemoryUsage { allocated: Bytes(alloc), resident: Bytes(0) } 17 MemoryUsage { allocated: Bytes(alloc), resident: Bytes(0) }
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 5eb2d0bb7..215eeb2f6 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -64,5 +64,4 @@ mbe = { path = "../ra_mbe", package = "ra_mbe" }
64tt = { path = "../ra_tt", package = "ra_tt" } 64tt = { path = "../ra_tt", package = "ra_tt" }
65 65
66[features] 66[features]
67jemalloc = [ "ra_prof/jemalloc" ]
68mimalloc = [ "ra_prof/mimalloc" ] 67mimalloc = [ "ra_prof/mimalloc" ]
diff --git a/crates/rust-analyzer/src/bin/args.rs b/crates/rust-analyzer/src/bin/args.rs
index 3210416ee..741a2a951 100644
--- a/crates/rust-analyzer/src/bin/args.rs
+++ b/crates/rust-analyzer/src/bin/args.rs
@@ -166,7 +166,7 @@ USAGE:
166FLAGS: 166FLAGS:
167 -o, --only Only analyze items matching this path 167 -o, --only Only analyze items matching this path
168 -h, --help Prints help information 168 -h, --help Prints help information
169 --memory-usage Collect memory usage statistics (requires `--features jemalloc`) 169 --memory-usage Collect memory usage statistics
170 --randomize Randomize order in which crates, modules, and items are processed 170 --randomize Randomize order in which crates, modules, and items are processed
171 --parallel Run type inference in parallel 171 --parallel Run type inference in parallel
172 --load-output-dirs Load OUT_DIR values by running `cargo check` before analysis 172 --load-output-dirs Load OUT_DIR values by running `cargo check` before analysis
@@ -221,7 +221,7 @@ USAGE:
221 221
222FLAGS: 222FLAGS:
223 -h, --help Prints help information 223 -h, --help Prints help information
224 --memory-usage Collect memory usage statistics (requires `--features jemalloc`) 224 --memory-usage Collect memory usage statistics
225 --load-output-dirs Load OUT_DIR values by running `cargo check` before analysis 225 --load-output-dirs Load OUT_DIR values by running `cargo check` before analysis
226 --with-proc-macro Use ra-proc-macro-srv for proc-macro expanding 226 --with-proc-macro Use ra-proc-macro-srv for proc-macro expanding
227 -v, --verbose 227 -v, --verbose