Added a new public method GetPageSize() to the KSysInfo class.

xvitaly · Oct 2, 2024 · 488537c · 488537c
1 parent 2529159
commit 488537c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/app/application/application.cpp b/src/app/application/application.cpp
@@ -94,8 +94,8 @@ void Application::PrintSummary()
     constexpr const long Power = 1024 << 10;
     const float PoolSizeMB = static_cast<float>(ZSwapDebugger -> GetPoolTotalSize()) / Power;
     const float MemTotalPercent = static_cast<float>(ZSwapDebugger -> GetPoolTotalSize()) / static_cast<float>(SysInfo -> GetTotalRam()) * 100.f;
-    const float StoredPagesMB = static_cast<float>(ZSwapDebugger -> GetStoredPages() * CWrappers::GetSCPageSize()) / Power;
-    const float SwapUsedPercent = static_cast<float>(ZSwapDebugger -> GetStoredPages() * CWrappers::GetSCPageSize()) / static_cast<float>(SysInfo -> GetTotalSwap() - SysInfo -> GetFreeSwap()) * 100.f;
+    const float StoredPagesMB = static_cast<float>(ZSwapDebugger -> GetStoredPages() * SysInfo -> GetPageSize()) / Power;
+    const float SwapUsedPercent = static_cast<float>(ZSwapDebugger -> GetStoredPages() * SysInfo -> GetPageSize()) / static_cast<float>(SysInfo -> GetTotalSwap() - SysInfo -> GetFreeSwap()) * 100.f;
     const float CompressionRatio = StoredPagesMB / PoolSizeMB;
 
     std::cout << std::format("Pool: {0:.2f} MiB ({1:.1f}% of MemTotal).\n"

diff --git a/src/lib/ksysinfo/ksysinfo.cpp b/src/lib/ksysinfo/ksysinfo.cpp
@@ -10,6 +10,7 @@
 #include <sys/sysinfo.h>
 
 #include "ksysinfo/ksysinfo.hpp"
+#include "cwrappers/cwrappers.hpp"
 
 long& KSysInfo::GetUptime()
 {
@@ -66,6 +67,11 @@ unsigned int& KSysInfo::GetMemUnitSize()
     return MemUnitSize;
 }
 
+long& KSysInfo::GetPageSize()
+{
+    return PageSize;
+}
+
 void KSysInfo::ReadSysInfo()
 {
     struct sysinfo SysInfo;
@@ -83,7 +89,13 @@ void KSysInfo::ReadSysInfo()
     MemUnitSize = static_cast<unsigned int>(SysInfo.mem_unit);
 }
 
+void KSysInfo::ReadPageSize()
+{
+    PageSize = CWrappers::GetSCPageSize();
+}
+
 KSysInfo::KSysInfo()
 {
     ReadSysInfo();
+    ReadPageSize();
 }
diff --git a/src/lib/ksysinfo/ksysinfo.hpp b/src/lib/ksysinfo/ksysinfo.hpp
@@ -88,13 +88,24 @@ class KSysInfo
      * @returns Memory unit size.
     */
     unsigned int& GetMemUnitSize();
+
+    /**
+     *  Gets system page size value.
+     * @returns System page size value.
+    */
+    long& GetPageSize();
 private:
     /**
      *  Reads the sysinfo structure into the class fields.
      * @exception Raises an instance of std::runtime_error on error.
     */
     void ReadSysInfo();
 
+    /**
+     *  Reads the SC_PAGESIZE system variable value.
+    */
+    void ReadPageSize();
+
     /**
      *  Stores current uptime (in seconds since boot) value.
     */
@@ -149,6 +160,11 @@ class KSysInfo
      *  Stores memory unit size in bytes value.
     */
     unsigned int MemUnitSize;
+
+    /**
+     *  Stores the system page size value.
+    */
+    long PageSize;
 };
 
 #endif // KSYSINFO_HPP