pkg:collector: remove the dram energy from the host other components energy consumption

Marcelo Amaral · Marcelo Amaral · commit 299f7b4f3881 · 2022-09-26T11:43:27.000+09:00
Signed-off-by: Marcelo Amaral &lt;marcelo.amaral1@ibm.com&gt;
diff --git a/pkg/collector/node_energy.go b/pkg/collector/node_energy.go
@@ -95,8 +95,9 @@ func (v *NodeEnergy) SetValues(sensorEnergy map[string]float64, pkgEnergy map[in
 	fmt.Printf("node energy stat core %v dram %v uncore %v pkg %v gpu %v sensor %v\n", v.EnergyInCore, v.EnergyInDRAM, v.EnergyInUncore, v.EnergyInPkg, v.EnergyInGPU, v.SensorEnergy)
 	totalSensorDelta := v.SensorEnergy.Curr()
 	totalPkgDelta := v.EnergyInPkg.Curr()
+	totalDramDelta := v.EnergyInDRAM.Curr()
 	if totalSensorDelta > (totalPkgDelta + totalGPUDelta) {
-		v.EnergyInOther = totalSensorDelta - (totalPkgDelta + totalGPUDelta)
+		v.EnergyInOther = totalSensorDelta - (totalPkgDelta + totalGPUDelta + totalDramDelta)
 	}
 	v.Usage = usage
 }

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,9 @@ func (v *NodeEnergy) SetValues(sensorEnergy map[string]float64, pkgEnergy map[in`
`95`	`95`	`fmt.Printf("node energy stat core %v dram %v uncore %v pkg %v gpu %v sensor %v\n", v.EnergyInCore, v.EnergyInDRAM, v.EnergyInUncore, v.EnergyInPkg, v.EnergyInGPU, v.SensorEnergy)`
`96`	`96`	`totalSensorDelta := v.SensorEnergy.Curr()`
`97`	`97`	`totalPkgDelta := v.EnergyInPkg.Curr()`
	`98`	`+ totalDramDelta := v.EnergyInDRAM.Curr()`
`98`	`99`	`if totalSensorDelta > (totalPkgDelta + totalGPUDelta) {`
`99`		`- v.EnergyInOther = totalSensorDelta - (totalPkgDelta + totalGPUDelta)`
	`100`	`+ v.EnergyInOther = totalSensorDelta - (totalPkgDelta + totalGPUDelta + totalDramDelta)`
`100`	`101`	`}`
`101`	`102`	`v.Usage = usage`
`102`	`103`	`}`