projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel_rdt plugin: fix compiler warnings
[collectd.git]
/
src
/
intel_rdt.c
diff --git
a/src/intel_rdt.c
b/src/intel_rdt.c
index
667033c
..
193aa77
100644
(file)
--- a/
src/intel_rdt.c
+++ b/
src/intel_rdt.c
@@
-25,9
+25,9
@@
* Serhiy Pshyk <serhiyx.pshyk@intel.com>
**/
* Serhiy Pshyk <serhiyx.pshyk@intel.com>
**/
-#include "common.h"
-#include "utils_config_cores.h"
#include "collectd.h"
#include "collectd.h"
+#include "utils/common/common.h"
+#include "utils/config_cores/config_cores.h"
#include <pqos.h>
#include <pqos.h>
@@
-71,7
+71,7
@@
static void rdt_dump_cgroups(void) {
core_group_t *cgroup = g_rdt->cores.cgroups + i;
memset(cores, 0, sizeof(cores));
core_group_t *cgroup = g_rdt->cores.cgroups + i;
memset(cores, 0, sizeof(cores));
- for (
in
t j = 0; j < cgroup->num_cores; j++) {
+ for (
size_
t j = 0; j < cgroup->num_cores; j++) {
snprintf(cores + strlen(cores), sizeof(cores) - strlen(cores) - 1, " %d",
cgroup->cores[j]);
}
snprintf(cores + strlen(cores), sizeof(cores) - strlen(cores) - 1, " %d",
cgroup->cores[j]);
}
@@
-100,8
+100,7
@@
static void rdt_dump_data(void) {
* MBR - remote memory bandwidth
*/
DEBUG(" CORE RMID LLC[KB] MBL[MB] MBR[MB]");
* MBR - remote memory bandwidth
*/
DEBUG(" CORE RMID LLC[KB] MBL[MB] MBR[MB]");
- for (int i = 0; i < g_rdt->num_groups; i++) {
-
+ for (size_t i = 0; i < g_rdt->num_groups; i++) {
const struct pqos_event_values *pv = &g_rdt->pgroups[i]->values;
double llc = bytes_to_kb(pv->llc);
const struct pqos_event_values *pv = &g_rdt->pgroups[i]->values;
double llc = bytes_to_kb(pv->llc);
@@
-124,7
+123,7
@@
static void rdt_free_cgroups(void) {
static int rdt_default_cgroups(void) {
unsigned num_cores = g_rdt->pqos_cpu->num_cores;
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;
if (g_rdt->cores.cgroups == NULL) {
ERROR(RDT_PLUGIN ": Error allocating core groups array");
return -ENOMEM;
@@
-137,7
+136,7
@@
static int rdt_default_cgroups(void) {
char desc[DATA_MAX_NAME_LEN];
/* set core group info */
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();
if (cgroup->cores == NULL) {
ERROR(RDT_PLUGIN ": Error allocating cores array");
rdt_free_cgroups();
@@
-336,8
+335,8
@@
static int rdt_config(oconfig_item_t *ci) {
return 0;
}
return 0;
}
-static void rdt_submit_derive(c
har *cgroup, char *type, char *type_instanc
e,
- derive_t value) {
+static void rdt_submit_derive(c
onst char *cgroup, const char *typ
e,
+
const char *type_instance,
derive_t value) {
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.derive = value};
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.derive = value};
@@
-352,8
+351,8
@@
static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,
plugin_dispatch_values(&vl);
}
plugin_dispatch_values(&vl);
}
-static void rdt_submit_gauge(c
har *cgroup, char *type, char *type_instanc
e,
- gauge_t value) {
+static void rdt_submit_gauge(c
onst char *cgroup, const char *typ
e,
+
const char *type_instance,
gauge_t value) {
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.gauge = value};
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.gauge = value};