X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fintel_rdt.c;h=d9491147930e8aff6a72e649a23c100c5beac002;hp=347835c17991309fa239da1e8fcc23ea0177bceb;hb=ee771cb0c5df11fad393de41571effb9708f0873;hpb=49c6892bbf13cc546f60310f7550b896b5921f61 diff --git a/src/intel_rdt.c b/src/intel_rdt.c index 347835c1..d9491147 100644 --- a/src/intel_rdt.c +++ b/src/intel_rdt.c @@ -25,9 +25,9 @@ * Serhiy Pshyk **/ -#include "common.h" -#include "utils_config_cores.h" #include "collectd.h" +#include "utils/common/common.h" +#include "utils/config_cores/config_cores.h" #include @@ -76,7 +76,7 @@ static void rdt_dump_cgroups(void) { cgroup->cores[j]); } - DEBUG(RDT_PLUGIN ": group[%d]:", i); + DEBUG(RDT_PLUGIN ": group[%zu]:", i); DEBUG(RDT_PLUGIN ": description: %s", cgroup->desc); DEBUG(RDT_PLUGIN ": cores: %s", cores); DEBUG(RDT_PLUGIN ": events: 0x%X", g_rdt->events[i]); @@ -124,7 +124,7 @@ static void rdt_free_cgroups(void) { static int rdt_default_cgroups(void) { unsigned num_cores = g_rdt->pqos_cpu->num_cores; - g_rdt->cores.cgroups = calloc(num_cores, sizeof(*(g_rdt->cores.cgroups))); + g_rdt->cores.cgroups = calloc(num_cores, sizeof(*g_rdt->cores.cgroups)); if (g_rdt->cores.cgroups == NULL) { ERROR(RDT_PLUGIN ": Error allocating core groups array"); return -ENOMEM; @@ -137,7 +137,7 @@ static int rdt_default_cgroups(void) { char desc[DATA_MAX_NAME_LEN]; /* set core group info */ - cgroup->cores = calloc(1, sizeof(*(cgroup->cores))); + cgroup->cores = calloc(1, sizeof(*cgroup->cores)); if (cgroup->cores == NULL) { ERROR(RDT_PLUGIN ": Error allocating cores array"); rdt_free_cgroups(); @@ -336,8 +336,8 @@ static int rdt_config(oconfig_item_t *ci) { return 0; } -static void rdt_submit_derive(char *cgroup, char *type, char *type_instance, - derive_t value) { +static void rdt_submit_derive(const char *cgroup, const char *type, + const char *type_instance, derive_t value) { value_list_t vl = VALUE_LIST_INIT; vl.values = &(value_t){.derive = value}; @@ -352,8 +352,8 @@ static void rdt_submit_derive(char *cgroup, char *type, char *type_instance, plugin_dispatch_values(&vl); } -static void rdt_submit_gauge(char *cgroup, char *type, char *type_instance, - gauge_t value) { +static void rdt_submit_gauge(const char *cgroup, const char *type, + const char *type_instance, gauge_t value) { value_list_t vl = VALUE_LIST_INIT; vl.values = &(value_t){.gauge = value};