Merge #5487

5487: Setup global allocator in the correct crate r=matklad a=matklad

It worked before, but was roundabout



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -13,20 +13,12 @@ doctest = false
 ra_arena = { path = "../ra_arena" }
 once_cell = "1.3.1"
 backtrace = { version = "0.3.44", optional = true }
-mimalloc = { version = "0.1.19", default-features = false, optional = true }
 cfg-if = "0.1.10"
 libc = "0.2.73"
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = { version = "0.3.2", optional = true }
-jemalloc-ctl = { version = "0.3.3", optional = true }
-
 [features]
-jemalloc = [ "jemallocator", "jemalloc-ctl" ]
 cpu_profiler = []
 
 # Uncomment to enable for the whole crate graph
 # default = [ "backtrace" ]
-# default = [ "jemalloc" ]
-# default = [ "mimalloc" ]
 # default = [ "cpu_profiler" ]

crates/ra_prof/Cargo.toml

@@ -13,16 +13,6 @@ pub use crate::{
     memory_usage::{Bytes, MemoryUsage},
 };
 
-// We use jemalloc mainly to get heap usage statistics, actual performance
-// difference is not measures.
-#[cfg(all(feature = "jemalloc", not(target_env = "msvc")))]
-#[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
-
-#[cfg(all(feature = "mimalloc"))]
-#[global_allocator]
-static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
-
 /// Prints backtrace to stderr, useful for debugging.
 #[cfg(feature = "backtrace")]
 pub fn print_backtrace() {

crates/ra_prof/src/lib.rs

@@ -1,7 +1,7 @@
 //! FIXME: write short doc here
+use std::fmt;
 
 use cfg_if::cfg_if;
-use std::fmt;
 
 pub struct MemoryUsage {
     pub allocated: Bytes,
@@ -11,13 +11,7 @@ pub struct MemoryUsage {
 impl MemoryUsage {
     pub fn current() -> MemoryUsage {
         cfg_if! {
-            if #[cfg(all(feature = "jemalloc", not(target_env = "msvc")))] {
-                jemalloc_ctl::epoch::advance().unwrap();
-                MemoryUsage {
-                    allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap()),
-                    resident: Bytes(jemalloc_ctl::stats::resident::read().unwrap()),
-                }
-            } else if #[cfg(target_os = "linux")] {
+            if #[cfg(target_os = "linux")] {
                 // Note: This is incredibly slow.
                 let alloc = unsafe { libc::mallinfo() }.uordblks as u32 as usize;
                 MemoryUsage { allocated: Bytes(alloc), resident: Bytes(0) }

crates/ra_prof/src/memory_usage.rs

@@ -29,6 +29,7 @@ serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.48"
 threadpool = "1.7.1"
 rayon = "1.3.1"
+mimalloc = { version = "0.1.19", default-features = false, optional = true }
 
 stdx = { path = "../stdx" }
 
@@ -62,7 +63,3 @@ expect = { path = "../expect" }
 test_utils = { path = "../test_utils" }
 mbe = { path = "../ra_mbe", package = "ra_mbe" }
 tt = { path = "../ra_tt", package = "ra_tt" }
-
-[features]
-jemalloc = [ "ra_prof/jemalloc" ]
-mimalloc = [ "ra_prof/mimalloc" ]

crates/rust-analyzer/Cargo.toml

@@ -166,7 +166,7 @@ USAGE:
 FLAGS:
     -o, --only              Only analyze items matching this path
     -h, --help              Prints help information
-        --memory-usage      Collect memory usage statistics (requires `--features jemalloc`)
+        --memory-usage      Collect memory usage statistics
         --randomize         Randomize order in which crates, modules, and items are processed
         --parallel          Run type inference in parallel
         --load-output-dirs  Load OUT_DIR values by running `cargo check` before analysis
@@ -221,7 +221,7 @@ USAGE:
 
 FLAGS:
     -h, --help          Prints help information
-    --memory-usage      Collect memory usage statistics (requires `--features jemalloc`)
+    --memory-usage      Collect memory usage statistics
     --load-output-dirs  Load OUT_DIR values by running `cargo check` before analysis
     --with-proc-macro   Use ra-proc-macro-srv for proc-macro expanding
     -v, --verbose

crates/rust-analyzer/src/bin/args.rs

@@ -16,6 +16,10 @@ use vfs::AbsPathBuf;
 
 use crate::args::HelpPrinted;
 
+#[cfg(all(feature = "mimalloc"))]
+#[global_allocator]
+static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 fn main() -> Result<()> {
     setup_logging()?;
     let args = match args::Args::parse()? {

crates/rust-analyzer/src/bin/main.rs

@@ -397,13 +397,7 @@ To log all communication between the server and the client, there are two choice
 
 There are also two VS Code commands which might be of interest:
 
-* `Rust Analyzer: Status` shows some memory-usage statistics. To take full
-  advantage of it, you need to compile rust-analyzer with jemalloc support:
-  ```
-  $ cargo install --path crates/rust-analyzer --force --features jemalloc
-  ```
-
-  There's an alias for this: `cargo xtask install --server --jemalloc`.
+* `Rust Analyzer: Status` shows some memory-usage statistics.
 
 * `Rust Analyzer: Syntax Tree` shows syntax tree of the current file/selection.
 

docs/dev/README.md

@@ -57,8 +57,6 @@ fn dist_server() -> Result<()> {
         env::set_var("CC", "clang");
         run!(
             "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release"
-            // We'd want to add, but that requires setting the right linker somehow
-            // --features=jemalloc
         )?;
     } else {
         run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?;

xtask/src/dist.rs

@@ -24,7 +24,6 @@ pub struct ServerOpt {
 
 pub enum Malloc {
     System,
-    Jemalloc,
     Mimalloc,
 }
 
@@ -138,7 +137,6 @@ fn install_server(opts: ServerOpt) -> Result<()> {
 
     let malloc_feature = match opts.malloc {
         Malloc::System => "",
-        Malloc::Jemalloc => "--features jemalloc",
         Malloc::Mimalloc => "--features mimalloc",
     };
     let res = run!("cargo install --path crates/rust-analyzer --locked --force {}", malloc_feature);