3 files changed, 12 insertions, 29 deletions

diff --git a/crates/ra_prof/Cargo.toml b/crates/ra_prof/Cargo.toml
index b3d52985a..6c214501e 100644
--- a/crates/ra_prof/Cargo.toml
+++ b/crates/ra_prof/Cargo.toml
@@ -13,18 +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 }
-
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = { version = "0.3.2", optional = true }
-jemalloc-ctl = { version = "0.3.3", optional = true }
+cfg-if = "0.1.10"
+libc = "0.2.73"
 
 [features]
-jemalloc = [ "jemallocator", "jemalloc-ctl" ]
 cpu_profiler = []
 
 # Uncomment to enable for the whole crate graph
 # default = [ "backtrace" ]
-# default = [ "jemalloc" ]
-# default = [ "mimalloc" ]
 # default = [ "cpu_profiler" ]
diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index b54531b4e..ba5609703 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -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() {
diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs
index 9768f656c..ee79ec3ee 100644
--- a/crates/ra_prof/src/memory_usage.rs
+++ b/crates/ra_prof/src/memory_usage.rs
@@ -1,26 +1,25 @@
 //! FIXME: write short doc here
-
 use std::fmt;
 
+use cfg_if::cfg_if;
+
 pub struct MemoryUsage {
     pub allocated: Bytes,
     pub resident: Bytes,
 }
 
 impl MemoryUsage {
-    #[cfg(all(feature = "jemalloc", not(target_env = "msvc")))]
     pub fn current() -> MemoryUsage {
-        jemalloc_ctl::epoch::advance().unwrap();
-        MemoryUsage {
-            allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap()),
-            resident: Bytes(jemalloc_ctl::stats::resident::read().unwrap()),
+        cfg_if! {
+            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) }
+            } else {
+                MemoryUsage { allocated: Bytes(0), resident: Bytes(0) }
+            }
         }
     }
-
-    #[cfg(any(not(feature = "jemalloc"), target_env = "msvc"))]
-    pub fn current() -> MemoryUsage {
-        MemoryUsage { allocated: Bytes(0), resident: Bytes(0) }
-    }
 }
 
 impl fmt::Display for MemoryUsage {