lib: improve usage of vectors in CPUMonitor class

Signed-off-by: Cedric CHEDALEUX <[email protected]>
Orange-OpenSource · Jun 5, 2024 · 8cd9ff8 · 8cd9ff8
1 parent c988aae
commit 8cd9ff8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/util/cpumonitor.cpp b/lib/util/cpumonitor.cpp
@@ -14,10 +14,10 @@
 using namespace std;
 
 uprofile::CpuMonitor::CpuMonitor() :
-    m_nbCpus(getNumberOfCPUCores())
+    m_nbCpus(getNumberOfCPUCores()),
+    m_lastIdleTimes(m_nbCpus, 0),
+    m_lastTotalTimes(m_nbCpus, 0)
 {
-    m_lastIdleTimes.resize(m_nbCpus, 0);
-    m_lastTotalTimes.resize(m_nbCpus, 0);
 }
 
 uprofile::CpuMonitor::~CpuMonitor()
@@ -60,7 +60,7 @@ void uprofile::CpuMonitor::extractCpuTimes(const string& cpuInfo, size_t& idleTi
 
 vector<float> uprofile::CpuMonitor::getUsage()
 {
-    vector<float> usages;
+    vector<float> usages(m_nbCpus, 0);
 #if defined(__linux__)
     ifstream procStat("/proc/stat");
     // /proc/stat dumps the following info:
@@ -85,7 +85,7 @@ vector<float> uprofile::CpuMonitor::getUsage()
 
                 // To compute CPU load, we compute the time the CPU has been idle since the last read.
                 float cpuLoad = 100.0 * (1.0 - (float)(idleTime - m_lastIdleTimes[cpuIndex]) / (totalTime - m_lastTotalTimes[cpuIndex]));
-                usages.push_back(cpuLoad);
+                usages[cpuIndex] = cpuLoad;
 
                 // Save the times value for the next read
                 m_lastIdleTimes[cpuIndex] = idleTime;

diff --git a/lib/util/cpumonitor.h b/lib/util/cpumonitor.h
@@ -30,11 +30,10 @@ class CpuMonitor
     static size_t getNumberOfCPUCores();
     static void extractCpuTimes(const string& cpuInfo, size_t& idleTime, size_t& totalTime);
 
+    size_t m_nbCpus;
     // Store the last idle and total time for each CPU
     vector<size_t> m_lastIdleTimes;
     vector<size_t> m_lastTotalTimes;
-
-    size_t m_nbCpus;
 };
 }