common: MemoryModel: do not store measurements

in the object itself

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/common/MemoryModel.cc b/src/common/MemoryModel.cc
index e7313c5852a510061cbdc4128a6b25973eb341d5..b9bc0511a0621427c8b62d0ab1126bef69e89e3b 100644 (file)
--- a/src/common/MemoryModel.cc
+++ b/src/common/MemoryModel.cc
@@ -143,13 +143,3 @@ tl::expected<mem_snap_t, std::string> MemoryModel::full_sample()
   s.heap = static_cast<long>(get_mapped_heap().value_or(0));
   return s;
 }
-
-void MemoryModel::sample(mem_snap_t *p)
-{
-  auto s = full_sample();
-  if (s) {
-    last = *s;
-    if (p)
-      *p = last;
-  }
-}

diff --git a/src/common/MemoryModel.h b/src/common/MemoryModel.h
index d6f14e7e5decca497923fdb6e4a3cfcadf2dac30..6cfe3c7acaf9dbcdb64762192e56d6fa60cb22c7 100644 (file)
--- a/src/common/MemoryModel.h
+++ b/src/common/MemoryModel.h
@@ -26,23 +26,18 @@
 class MemoryModel {
 public:
   struct mem_snap_t {
-    long peak;
-    long size;
-    long hwm;
-    long rss;
-    long data;
-    long lib;
-
-    long heap;
-
-    mem_snap_t() : peak(0), size(0), hwm(0), rss(0), data(0), lib(0),
-            heap(0)
-    {}
+    long peak{0};
+    long size{0};
+    long hwm{0};
+    long rss{0};
+    long data{0};
+    long lib{0};
+    long heap{0};
 
     long get_total() const { return size; }
     long get_rss() const { return rss; }
     long get_heap() const { return heap; }
-  } last;
+  };
 
 private:
   static inline constexpr const char* proc_stat_fn = PROCPREFIX "/proc/self/status";
@@ -81,8 +76,6 @@ public:
    *    size will be reported as 0).
    */
   tl::expected<mem_snap_t, std::string> full_sample();
-
-  void sample(mem_snap_t *p = nullptr);
 };
 
 #endif