From: Ronen Friedman <rfriedma@redhat.com>
Date: Tue, 18 Jun 2024 14:44:46 +0000 (-0500)
Subject: common: MemoryModel: do not store measurements
X-Git-Tag: v20.0.0~1349^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=705e60f77a1a629cf56107db2be78badd1de95db;p=ceph.git

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 e7313c5852a5..b9bc0511a062 100644
--- 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 d6f14e7e5dec..6cfe3c7acaf9 100644
--- 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