fixes

rdementi · rdementi · commit 16e270f17c72 · 2024-01-19T13:21:42.000+01:00
Change-Id: I7dc199499e54c3d873644b3bbf240bae8c142c35
diff --git a/src/cpucounters.h b/src/cpucounters.h
@@ -822,11 +822,12 @@ class PCM_API PCM
 
 public:
 
-    size_t getMaxNumOfUncorePMUs(const int pmu_id) const
+    size_t getMaxNumOfUncorePMUs(const int pmu_id, const size_t socket = 0) const
     {
         size_t count = 0ULL;
-        for (auto& s : uncorePMUs)
+        if (socket < uncorePMUs.size())
         {
+            const auto & s = uncorePMUs[socket];
             for (auto& d : s)
             {
                 const auto iter = d.find(pmu_id);
diff --git a/src/pcm-power.cpp b/src/pcm-power.cpp
@@ -76,7 +76,12 @@ uint64 getPPDCycles(uint32 channel, const ServerUncoreCounterState & before, con
 
 double getNormalizedPCUCounter(uint32 unit, uint32 counter, const ServerUncoreCounterState & before, const ServerUncoreCounterState & after)
 {
-    return double(getUncoreCounter(PCM::PCU_PMU_ID, unit, counter, before, after)) / double(getPCUClocks(unit, before, after));
+    const auto clk = getPCUClocks(unit, before, after);
+    if (clk)
+    {
+        return double(getUncoreCounter(PCM::PCU_PMU_ID, unit, counter, before, after)) / double(clk);
+    }
+    return -1.0;
 }
 
 double getNormalizedPCUCounter(uint32 unit, uint32 counter, const ServerUncoreCounterState & before, const ServerUncoreCounterState & after, PCM * m)

Original file line number	Diff line number	Diff line change
`@@ -822,11 +822,12 @@ class PCM_API PCM`
`822`	`822`
`823`	`823`	`public:`
`824`	`824`
`825`		`- size_t getMaxNumOfUncorePMUs(const int pmu_id) const`
	`825`	`+ size_t getMaxNumOfUncorePMUs(const int pmu_id, const size_t socket = 0) const`
`826`	`826`	`{`
`827`	`827`	`size_t count = 0ULL;`
`828`		`- for (auto& s : uncorePMUs)`
	`828`	`+ if (socket < uncorePMUs.size())`
`829`	`829`	`{`
	`830`	`+ const auto & s = uncorePMUs[socket];`
`830`	`831`	`for (auto& d : s)`
`831`	`832`	`{`
`832`	`833`	`const auto iter = d.find(pmu_id);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,12 @@ uint64 getPPDCycles(uint32 channel, const ServerUncoreCounterState & before, con`
`76`	`76`
`77`	`77`	`double getNormalizedPCUCounter(uint32 unit, uint32 counter, const ServerUncoreCounterState & before, const ServerUncoreCounterState & after)`
`78`	`78`	`{`
`79`		`- return double(getUncoreCounter(PCM::PCU_PMU_ID, unit, counter, before, after)) / double(getPCUClocks(unit, before, after));`
	`79`	`+ const auto clk = getPCUClocks(unit, before, after);`
	`80`	`+ if (clk)`
	`81`	`+ {`
	`82`	`+ return double(getUncoreCounter(PCM::PCU_PMU_ID, unit, counter, before, after)) / double(clk);`
	`83`	`+ }`
	`84`	`+ return -1.0;`
`80`	`85`	`}`
`81`	`86`
`82`	`87`	`double getNormalizedPCUCounter(uint32 unit, uint32 counter, const ServerUncoreCounterState & before, const ServerUncoreCounterState & after, PCM * m)`