X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fintel_rdt.c;h=347835c17991309fa239da1e8fcc23ea0177bceb;hb=49c6892bbf13cc546f60310f7550b896b5921f61;hp=684e2b6dfd57524368d3603f3d7bc41c624c93f0;hpb=07ba05937aeaedd683656c3912040950dbf4a152;p=collectd.git diff --git a/src/intel_rdt.c b/src/intel_rdt.c index 684e2b6d..347835c1 100644 --- a/src/intel_rdt.c +++ b/src/intel_rdt.c @@ -67,7 +67,7 @@ static void rdt_dump_cgroups(void) { DEBUG(RDT_PLUGIN ": Core Groups Dump"); DEBUG(RDT_PLUGIN ": groups count: %" PRIsz, g_rdt->num_groups); - for (int i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->num_groups; i++) { core_group_t *cgroup = g_rdt->cores.cgroups + i; memset(cores, 0, sizeof(cores)); @@ -158,9 +158,9 @@ static int rdt_default_cgroups(void) { return num_cores; } -static int rdt_is_core_id_valid(int core_id) { +static int rdt_is_core_id_valid(unsigned int core_id) { - for (int i = 0; i < g_rdt->pqos_cpu->num_cores; i++) + for (unsigned int i = 0; i < g_rdt->pqos_cpu->num_cores; i++) if (core_id == g_rdt->pqos_cpu->cores[i].lcore) return 1; @@ -182,9 +182,9 @@ static int rdt_config_cgroups(oconfig_item_t *item) { for (size_t group_idx = 0; group_idx < n; group_idx++) { core_group_t *cgroup = g_rdt->cores.cgroups + group_idx; for (size_t core_idx = 0; core_idx < cgroup->num_cores; core_idx++) { - if (!rdt_is_core_id_valid((int)cgroup->cores[core_idx])) { - ERROR(RDT_PLUGIN ": Core group '%s' contains invalid core id '%d'", - cgroup->desc, (int)cgroup->cores[core_idx]); + if (!rdt_is_core_id_valid(cgroup->cores[core_idx])) { + ERROR(RDT_PLUGIN ": Core group '%s' contains invalid core id '%u'", + cgroup->desc, cgroup->cores[core_idx]); rdt_free_cgroups(); return -EINVAL; } @@ -205,7 +205,7 @@ static int rdt_config_cgroups(oconfig_item_t *item) { } /* Get all available events on this platform */ - for (int i = 0; i < g_rdt->cap_mon->u.mon->num_events; i++) + for (unsigned int i = 0; i < g_rdt->cap_mon->u.mon->num_events; i++) events |= g_rdt->cap_mon->u.mon->events[i].type; events &= ~(PQOS_PERF_EVENT_LLC_MISS); @@ -386,7 +386,7 @@ static int rdt_read(__attribute__((unused)) user_data_t *ud) { rdt_dump_data(); #endif /* COLLECT_DEBUG */ - for (int i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->num_groups; i++) { core_group_t *cgroup = g_rdt->cores.cgroups + i; enum pqos_mon_event mbm_events = @@ -425,7 +425,7 @@ static int rdt_init(void) { return ret; /* Start monitoring */ - for (int i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->num_groups; i++) { core_group_t *cg = g_rdt->cores.cgroups + i; ret = pqos_mon_start(cg->num_cores, cg->cores, g_rdt->events[i], @@ -448,7 +448,7 @@ static int rdt_shutdown(void) { return 0; /* Stop monitoring */ - for (int i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->num_groups; i++) { pqos_mon_stop(g_rdt->pgroups[i]); }