Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links

Hasn't fixed tests yet.

1 files changed, 32 insertions, 20 deletions

diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs
index 9768f656c..c2ecbd33c 100644
--- a/crates/ra_prof/src/memory_usage.rs
+++ b/crates/ra_prof/src/memory_usage.rs
@@ -1,46 +1,58 @@
 //! FIXME: write short doc here
-
 use std::fmt;
 
+use cfg_if::cfg_if;
+
+#[derive(Copy, Clone)]
 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()),
-        }
+impl fmt::Display for MemoryUsage {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "{}", self.allocated)
     }
+}
 
-    #[cfg(any(not(feature = "jemalloc"), target_env = "msvc"))]
-    pub fn current() -> MemoryUsage {
-        MemoryUsage { allocated: Bytes(0), resident: Bytes(0) }
+impl std::ops::Sub for MemoryUsage {
+    type Output = MemoryUsage;
+    fn sub(self, rhs: MemoryUsage) -> MemoryUsage {
+        MemoryUsage { allocated: self.allocated - rhs.allocated }
     }
 }
 
-impl fmt::Display for MemoryUsage {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{} allocated {} resident", self.allocated, self.resident,)
+impl MemoryUsage {
+    pub fn current() -> MemoryUsage {
+        cfg_if! {
+            if #[cfg(target_os = "linux")] {
+                // Note: This is incredibly slow.
+                let alloc = unsafe { libc::mallinfo() }.uordblks as isize;
+                MemoryUsage { allocated: Bytes(alloc) }
+            } else {
+                MemoryUsage { allocated: Bytes(0) }
+            }
+        }
     }
 }
 
 #[derive(Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct Bytes(usize);
+pub struct Bytes(isize);
+
+impl Bytes {
+    pub fn megabytes(self) -> isize {
+        self.0 / 1024 / 1024
+    }
+}
 
 impl fmt::Display for Bytes {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let bytes = self.0;
         let mut value = bytes;
         let mut suffix = "b";
-        if value > 4096 {
+        if value.abs() > 4096 {
             value /= 1024;
             suffix = "kb";
-            if value > 4096 {
+            if value.abs() > 4096 {
                 value /= 1024;
                 suffix = "mb";
             }
@@ -51,7 +63,7 @@ impl fmt::Display for Bytes {
 
 impl std::ops::AddAssign<usize> for Bytes {
     fn add_assign(&mut self, x: usize) {
-        self.0 += x;
+        self.0 += x as isize;
     }
 }