projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2660 from pbostley/master
[collectd.git]
/
src
/
intel_rdt.c
diff --git
a/src/intel_rdt.c
b/src/intel_rdt.c
index
7966daa
..
29c02fe
100644
(file)
--- a/
src/intel_rdt.c
+++ b/
src/intel_rdt.c
@@
-25,8
+25,8
@@
* Serhiy Pshyk <serhiyx.pshyk@intel.com>
**/
* Serhiy Pshyk <serhiyx.pshyk@intel.com>
**/
-#include "common.h"
#include "collectd.h"
#include "collectd.h"
+#include "common.h"
#include <pqos.h>
#include <pqos.h>
@@
-308,7
+308,7
@@
static void rdt_dump_cgroups(void) {
return;
DEBUG(RDT_PLUGIN ": Core Groups Dump");
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++) {
for (int i = 0; i < g_rdt->num_groups; i++) {
@@
-375,7
+375,7
@@
static int rdt_default_cgroups(void) {
char desc[DATA_MAX_NAME_LEN];
uint64_t core = i;
char desc[DATA_MAX_NAME_LEN];
uint64_t core = i;
- s
s
nprintf(desc, sizeof(desc), "%d", g_rdt->pqos_cpu->cores[i].lcore);
+ snprintf(desc, sizeof(desc), "%d", g_rdt->pqos_cpu->cores[i].lcore);
/* set core group info */
ret = cgroup_set(&g_rdt->cgroups[i], desc, &core, 1);
/* set core group info */
ret = cgroup_set(&g_rdt->cgroups[i], desc, &core, 1);
@@
-426,8
+426,8
@@
static int rdt_config_cgroups(oconfig_item_t *item) {
core_idx++) {
if (!rdt_is_core_id_valid(g_rdt->cgroups[group_idx].cores[core_idx])) {
ERROR(RDT_PLUGIN ": Core group '%s' contains invalid core id '%d'",
core_idx++) {
if (!rdt_is_core_id_valid(g_rdt->cgroups[group_idx].cores[core_idx])) {
ERROR(RDT_PLUGIN ": Core group '%s' contains invalid core id '%d'",
-
g_rdt->cgroups[group_idx].desc,
-
(int)g_rdt->cgroups[group_idx].cores[core_idx]);
+ g_rdt->cgroups[group_idx].desc,
+ (int)g_rdt->cgroups[group_idx].cores[core_idx]);
rdt_free_cgroups();
return -EINVAL;
}
rdt_free_cgroups();
return -EINVAL;
}
@@
-656,7
+656,7
@@
static int rdt_read(__attribute__((unused)) user_data_t *ud) {
static int rdt_init(void) {
int ret;
static int rdt_init(void) {
int ret;
- if(g_state == CONFIGURATION_ERROR)
+ if
(g_state == CONFIGURATION_ERROR)
return -1;
ret = rdt_preinit();
return -1;
ret = rdt_preinit();