Skip to content
Snippets Groups Projects
Commit ec08108d authored by Morris Jette's avatar Morris Jette
Browse files

Bad variable names in previous commit

parent a72e5d6e
No related branches found
No related tags found
No related merge requests found
...@@ -162,7 +162,7 @@ static uint64_t _get_package_energy(int pkg) ...@@ -162,7 +162,7 @@ static uint64_t _get_package_energy(int pkg)
* See: Intel 64 and IA-32 Architectures Software Developer's * See: Intel 64 and IA-32 Architectures Software Developer's
* Manual, Volume 3 for details */ * Manual, Volume 3 for details */
result = _read_msr(pkg_fd[pkg], MSR_PKG_ENERGY_STATUS); result = _read_msr(pkg_fd[pkg], MSR_PKG_ENERGY_STATUS);
results &= 0xffffffff; result &= 0xffffffff;
if (result < package_energy[pkg].i.low) if (result < package_energy[pkg].i.low)
package_energy[pkg].i.high++; package_energy[pkg].i.high++;
package_energy[pkg].i.low = result; package_energy[pkg].i.low = result;
...@@ -179,7 +179,7 @@ static uint64_t _get_dram_energy(int pkg) ...@@ -179,7 +179,7 @@ static uint64_t _get_dram_energy(int pkg)
* See: Intel 64 and IA-32 Architectures Software Developer's * See: Intel 64 and IA-32 Architectures Software Developer's
* Manual, Volume 3 for details */ * Manual, Volume 3 for details */
result = _read_msr(pkg_fd[pkg], MSR_DRAM_ENERGY_STATUS); result = _read_msr(pkg_fd[pkg], MSR_DRAM_ENERGY_STATUS);
results &= 0xffffffff; result &= 0xffffffff;
if (result < dram_energy[pkg].i.low) if (result < dram_energy[pkg].i.low)
dram_energy[pkg].i.high++; dram_energy[pkg].i.high++;
dram_energy[pkg].i.low = result; dram_energy[pkg].i.low = result;
...@@ -337,7 +337,7 @@ static void _get_joules_task(acct_gather_energy_t *energy) ...@@ -337,7 +337,7 @@ static void _get_joules_task(acct_gather_energy_t *energy)
* See: Intel 64 and IA-32 Architectures Software Developer's * See: Intel 64 and IA-32 Architectures Software Developer's
* Manual, Volume 3 for details */ * Manual, Volume 3 for details */
result = _read_msr(pkg_fd[0], MSR_PKG_POWER_INFO); result = _read_msr(pkg_fd[0], MSR_PKG_POWER_INFO);
max_power = power_units * ((results >> 32) & 0x7fff); max_power = power_units * ((result >> 32) & 0x7fff);
if (debug_flags & DEBUG_FLAG_ENERGY) if (debug_flags & DEBUG_FLAG_ENERGY)
info("RAPL Max power = %ld w", max_power); info("RAPL Max power = %ld w", max_power);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment