From 45a1f61ab3aaaf294d868026527a276bb6204c1d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 26 Jun 2015 14:30:31 -0700
Subject: [PATCH] Fix regression in commit 2e8e65aafeeb1
---
.../acct_gather_energy/rapl/acct_gather_energy_rapl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c b/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c
index 8435e2f412f..d86111db265 100644
--- a/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c
+++ b/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c
@@ -355,12 +355,13 @@ static void _get_joules_task(acct_gather_energy_t *energy)
if (energy->consumed_energy) {
uint16_t node_freq;
- uint64_t diff_energy = energy->consumed_energy =
+ energy->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();
if (node_freq) /* Prevent divide by zero */
- diff_energy /= (float)node_freq;
- local_energy->current_watts = (uint32_t) diff_energy;
+ energy->current_watts /= (float)node_freq;
} else {
energy->consumed_energy = 1;
energy->base_consumed_energy = (uint64_t)ret;
--
GitLab