Skip to content
Snippets Groups Projects
Commit 45a1f61a authored by Danny Auble's avatar Danny Auble
Browse files

Fix regression in commit 2e8e65aa

parent 1625af21
No related branches found
No related tags found
No related merge requests found
...@@ -355,12 +355,13 @@ static void _get_joules_task(acct_gather_energy_t *energy) ...@@ -355,12 +355,13 @@ static void _get_joules_task(acct_gather_energy_t *energy)
if (energy->consumed_energy) { if (energy->consumed_energy) {
uint16_t node_freq; uint16_t node_freq;
uint64_t diff_energy = energy->consumed_energy = energy->consumed_energy =
(uint64_t)ret - energy->base_consumed_energy; (uint64_t)ret - energy->base_consumed_energy;
energy->current_watts =
(uint32_t)ret - energy->previous_consumed_energy;
node_freq = slurm_get_acct_gather_node_freq(); node_freq = slurm_get_acct_gather_node_freq();
if (node_freq) /* Prevent divide by zero */ if (node_freq) /* Prevent divide by zero */
diff_energy /= (float)node_freq; energy->current_watts /= (float)node_freq;
local_energy->current_watts = (uint32_t) diff_energy;
} else { } else {
energy->consumed_energy = 1; energy->consumed_energy = 1;
energy->base_consumed_energy = (uint64_t)ret; energy->base_consumed_energy = (uint64_t)ret;
......
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