1 files changed, 22 insertions, 15 deletions

diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs
index 745345fac..c2ecbd33c 100644
--- a/crates/ra_prof/src/memory_usage.rs
+++ b/crates/ra_prof/src/memory_usage.rs
@@ -3,9 +3,22 @@ use std::fmt;
 
 use cfg_if::cfg_if;
 
+#[derive(Copy, Clone)]
 pub struct MemoryUsage {
     pub allocated: Bytes,
-    pub resident: Bytes,
+}
+
+impl fmt::Display for MemoryUsage {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "{}", self.allocated)
+    }
+}
+
+impl std::ops::Sub for MemoryUsage {
+    type Output = MemoryUsage;
+    fn sub(self, rhs: MemoryUsage) -> MemoryUsage {
+        MemoryUsage { allocated: self.allocated - rhs.allocated }
+    }
 }
 
 impl MemoryUsage {
@@ -13,26 +26,20 @@ impl MemoryUsage {
         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) }
+                let alloc = unsafe { libc::mallinfo() }.uordblks as isize;
+                MemoryUsage { allocated: Bytes(alloc) }
             } else {
-                MemoryUsage { allocated: Bytes(0), resident: Bytes(0) }
+                MemoryUsage { allocated: Bytes(0) }
             }
         }
     }
 }
 
-impl fmt::Display for MemoryUsage {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{} allocated {} resident", self.allocated, self.resident,)
-    }
-}
-
 #[derive(Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct Bytes(usize);
+pub struct Bytes(isize);
 
 impl Bytes {
-    pub fn megabytes(self) -> usize {
+    pub fn megabytes(self) -> isize {
         self.0 / 1024 / 1024
     }
 }
@@ -42,10 +49,10 @@ impl fmt::Display for Bytes {
         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";
             }
@@ -56,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;
     }
 }