diff options
author | Jonas Schievink <[email protected]> | 2021-01-18 18:25:55 +0000 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2021-01-18 18:39:46 +0000 |
commit | 9b5fa1c61a85972da419aa29d61286cb9e268f83 (patch) | |
tree | 29704f0e4140261ed68bb5ea3cf52e7385bfc997 /crates/profile/src | |
parent | 6764d790ac904533dc7618fd38724a135499f87c (diff) |
Add back jemalloc support
Diffstat (limited to 'crates/profile/src')
-rw-r--r-- | crates/profile/src/memory_usage.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crates/profile/src/memory_usage.rs b/crates/profile/src/memory_usage.rs index 83390212a..cb4e54447 100644 --- a/crates/profile/src/memory_usage.rs +++ b/crates/profile/src/memory_usage.rs | |||
@@ -24,7 +24,12 @@ impl std::ops::Sub for MemoryUsage { | |||
24 | impl MemoryUsage { | 24 | impl MemoryUsage { |
25 | pub fn current() -> MemoryUsage { | 25 | pub fn current() -> MemoryUsage { |
26 | cfg_if! { | 26 | cfg_if! { |
27 | if #[cfg(all(target_os = "linux", target_env = "gnu"))] { | 27 | if #[cfg(all(feature = "jemalloc", not(target_env = "msvc")))] { |
28 | jemalloc_ctl::epoch::advance().unwrap(); | ||
29 | MemoryUsage { | ||
30 | allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap() as isize), | ||
31 | } | ||
32 | } else if #[cfg(all(target_os = "linux", target_env = "gnu"))] { | ||
28 | // Note: This is incredibly slow. | 33 | // Note: This is incredibly slow. |
29 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; | 34 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; |
30 | MemoryUsage { allocated: Bytes(alloc) } | 35 | MemoryUsage { allocated: Bytes(alloc) } |