From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Sun, 20 May 2018 15:51:49 +0000 (+0700)
Subject: Merge branch 'collectd-5.8'
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=07ba05937aeaedd683656c3912040950dbf4a152;p=collectd.git

Merge branch 'collectd-5.8'
---

07ba05937aeaedd683656c3912040950dbf4a152
diff --cc src/intel_rdt.c
index 3d4c9889,38a6e931..684e2b6d
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@@ -25,8 -25,10 +25,9 @@@
   *   Serhiy Pshyk <serhiyx.pshyk@intel.com>
   **/
  
--#include "collectd.h"
  #include "common.h"
 -
+ #include "utils_config_cores.h"
++#include "collectd.h"
  
  #include <pqos.h>
  
@@@ -308,14 -66,15 +65,15 @@@ static void rdt_dump_cgroups(void) 
      return;
  
    DEBUG(RDT_PLUGIN ": Core Groups Dump");
 -  DEBUG(RDT_PLUGIN ":  groups count: %zu", g_rdt->num_groups);
 +  DEBUG(RDT_PLUGIN ":  groups count: %" PRIsz, g_rdt->num_groups);
  
    for (int i = 0; i < g_rdt->num_groups; i++) {
+     core_group_t *cgroup = g_rdt->cores.cgroups + i;
  
      memset(cores, 0, sizeof(cores));
-     for (int j = 0; j < g_rdt->cgroups[i].num_cores; j++) {
+     for (int j = 0; j < cgroup->num_cores; j++) {
        snprintf(cores + strlen(cores), sizeof(cores) - strlen(cores) - 1, " %d",
-                g_rdt->cgroups[i].cores[j]);
+                cgroup->cores[j]);
      }
  
      DEBUG(RDT_PLUGIN ":  group[%d]:", i);