diff options
| author | Igor Aleksanov <[email protected]> | 2020-08-12 15:26:43 +0100 |
|---|---|---|
| committer | Igor Aleksanov <[email protected]> | 2020-08-12 15:26:43 +0100 |
| commit | b50bb800a5b5e01b6cb4de10330fd5b61d6cd0db (patch) | |
| tree | adb19b05996e8a2829f5a6eb0ed7017404aaf7da /crates/ra_prof/src | |
| parent | 13f736d4a13bdf5af2cdd6a4832a41470431a70b (diff) | |
| parent | 6be5ab02008b442c85c201968b97f24f13c4692e (diff) | |
Merge branch 'master' into add-disable-diagnostics
Diffstat (limited to 'crates/ra_prof/src')
| -rw-r--r-- | crates/ra_prof/src/memory_usage.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs index c2ecbd33c..83390212a 100644 --- a/crates/ra_prof/src/memory_usage.rs +++ b/crates/ra_prof/src/memory_usage.rs | |||
| @@ -24,7 +24,7 @@ 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(target_os = "linux")] { | 27 | if #[cfg(all(target_os = "linux", target_env = "gnu"))] { |
| 28 | // Note: This is incredibly slow. | 28 | // Note: This is incredibly slow. |
| 29 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; | 29 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; |
| 30 | MemoryUsage { allocated: Bytes(alloc) } | 30 | MemoryUsage { allocated: Bytes(alloc) } |