From aba4339da6b1c40f81ee425ea6bf8b4694903ada Mon Sep 17 00:00:00 2001 From: Georges Da Costa <dacosta@irit.fr> Date: Tue, 5 May 2020 09:29:54 +0200 Subject: [PATCH] corrects a bug for monitoring RAPL counters --- rapl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/rapl.c b/rapl.c index d988366..be6877f 100644 --- a/rapl.c +++ b/rapl.c @@ -44,7 +44,6 @@ _rapl_t* init_rapl(const uint32_t nb_zones, const int *rapl_zones) { exit(-1); } - printf("%d %d\n\n", nb_zones, rapl->nb_pkgs); rapl->names = NULL; char _name[MAX_LEN_NAME+1]; @@ -52,9 +51,9 @@ _rapl_t* init_rapl(const uint32_t nb_zones, const int *rapl_zones) { for (unsigned int package = 0; package < rapl->nb_pkgs; package++) { for(unsigned int zone=0; zone < nb_zones; zone++) { - int a=powercap_rapl_get_name(&rapl->pkgs[package], rapl_zones[zone], + int length=powercap_rapl_get_name(&rapl->pkgs[package], rapl_zones[zone], _name, MAX_LEN_NAME); - if (a>0) { + if (length>0) { sprintf(_name2, "%s%u", _name, package); @@ -65,11 +64,11 @@ _rapl_t* init_rapl(const uint32_t nb_zones, const int *rapl_zones) { rapl->packages = realloc(rapl->packages, sizeof(uint32_t)*rapl->nb); strcpy(rapl->names[rapl->nb-1], _name2); - rapl->zones[rapl->nb-1] = zone; + rapl->zones[rapl->nb-1] = rapl_zones[zone]; rapl->packages[rapl->nb-1] = package; } #ifdef DEBUG - printf("%d %d %d %s\n\n", a, package, zone, _name2); + printf("%d %d %d %d %s\n\n", length, package, zone, rapl_zones[zone], _name2); #endif } } @@ -86,7 +85,10 @@ _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++) { - int ret = powercap_rapl_get_energy_uj(&rapl->pkgs[rapl->packages[i]], +#ifdef DEBUG + int ret = +#endif + powercap_rapl_get_energy_uj(&rapl->pkgs[rapl->packages[i]], rapl->zones[i], &values[i]); #ifdef DEBUG -- GitLab