From 0f23a1341003f61494220a466c3f8dd3c25dc078 Mon Sep 17 00:00:00 2001
From: Georges Da Costa <dacosta@irit.fr>
Date: Tue, 5 May 2020 08:41:08 +0200
Subject: [PATCH] improves debug message for RAPL

---
 rapl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rapl.c b/rapl.c
index ec060ef..d988366 100644
--- a/rapl.c
+++ b/rapl.c
@@ -76,7 +76,7 @@ _rapl_t* init_rapl(const uint32_t nb_zones, const int *rapl_zones) {
 #ifdef DEBUG
   printf("Result of init\n");
   for(int i=0; i<rapl->nb; i++)
-    printf("package %d, zone %d, name %s\n", rapl->zones[i], rapl->packages[i], rapl->names[i]);
+    printf("package %d, zone %d, name %s\n", rapl->packages[i], rapl->zones[i], rapl->names[i]);
 #endif
   return rapl;
 }
@@ -86,9 +86,12 @@ _rapl_t* init_rapl(const uint32_t nb_zones, const int *rapl_zones) {
 // values [zone + package *nbzones] microjoules
 void get_rapl(uint64_t *values, _rapl_t* rapl) {
   for (int i = 0; i < rapl->nb; i++) {
-    powercap_rapl_get_energy_uj(&rapl->pkgs[rapl->packages[i]],
+    int ret = powercap_rapl_get_energy_uj(&rapl->pkgs[rapl->packages[i]],
 				rapl->zones[i],
 				&values[i]);
+#ifdef DEBUG
+    printf("GETRAPL: package %d, zone %d, name %s, ret: %d\n", rapl->packages[i], rapl->zones[i], rapl->names[i], ret);
+#endif
   }
 }
 
-- 
GitLab