refactor readUncoreCounterValues

Author: rdementi

src/cpucounters.cpp

@@ -6564,9 +6564,7 @@ ServerUncoreCounterState PCM::getServerUncoreCounterState(uint32 socket)
         uint32 refCore = socketRefCore[socket];
         TemporalThreadAffinity tempThreadAffinity(refCore);
 
-        readUncoreCounterValues(result, socket, CBO_PMU_ID);
-
-        readUncoreCounterValues(result, socket, MDF_PMU_ID);
+        readUncoreCounterValues(result, socket);
 
         for (uint32 stack = 0; socket < iioPMUs.size() && stack < iioPMUs[socket].size() && stack < ServerUncoreCounterState::maxIIOStacks; ++stack)
         {
@@ -6586,11 +6584,8 @@ ServerUncoreCounterState PCM::getServerUncoreCounterState(uint32 socket)
             }
         }
 
-        readUncoreCounterValues(result, socket, UBOX_PMU_ID);
         result.UncClocks = getUncoreClocks(socket);
 
-        readUncoreCounterValues(result, socket, PCU_PMU_ID);
-
         for (size_t p = 0; p < getNumCXLPorts(socket); ++p)
         {
             for (int i = 0; i < ServerUncoreCounterState::maxCounters && socket < cxlPMUs.size() && size_t(i) < cxlPMUs[socket][p].first.size(); ++i)

src/cpucounters.h

@@ -714,7 +714,7 @@ class PCM_API PCM
     }
 
     template <class T>
-    void readUncoreCounterValues(T& result, const size_t socket, const int pmu_id) const
+    void readUncoreCounterValues(T& result, const size_t socket) const
     {
         if (socket < uncorePMUs.size())
         {
@@ -723,9 +723,9 @@ class PCM_API PCM
             {
                 TemporalThreadAffinity tempThreadAffinity(socketRefCore[socket]); // speedup trick for Linux
 
-                const auto& pmuIter = uncorePMUs[socket][die].find(pmu_id);
-                if (pmuIter != uncorePMUs[socket][die].end())
+                for (auto pmuIter = uncorePMUs[socket][die].begin(); pmuIter != uncorePMUs[socket][die].end(); ++pmuIter)
                 {
+                    const auto & pmu_id = pmuIter->first;
                     result.Counters[die][pmu_id].resize(pmuIter->second.size());
                     for (size_t unit = 0; unit < pmuIter->second.size(); ++unit)
                     {