Skip to content

Commit

Permalink
Merge pull request collectd#4161 from octo/intel_rdt/pids2
Browse files Browse the repository at this point in the history 
Intel RDT plugin: use `pqos_mon_start_pids2()` if available.
  • Loading branch information
@octo
octo authored Nov 24, 2023
2 parents 84431dd + 102b360 commit b0d7a29
Showing 1 changed file with 41 additions and 11 deletions.
52 changes: 41 additions & 11 deletions src/intel_rdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,11 @@ static void rdt_free_ngroups(rdt_ctx_t *rdt) {
proc_pids_free(rdt->ngroups[i].proc_pids, rdt->ngroups[i].num_names);

rdt->ngroups[i].num_names = 0;
#if PQOS_VERSION >= 40600
/* no op: memory is freed by pqos_mon_stop(). */
#else
sfree(rdt->pngroups[i]);
#endif
}
if (rdt->proc_pids)
sfree(rdt->proc_pids);
Expand Down Expand Up @@ -671,13 +675,17 @@ static int rdt_config_ngroups(rdt_ctx_t *rdt, const oconfig_item_t *item) {
}
}

#if PQOS_VERSION >= 40600
/* no op: memory will be allocated by pqos_mon_start_pids(). */
#else
rdt->pngroups[i] = calloc(1, sizeof(*rdt->pngroups[i]));
if (rdt->pngroups[i] == NULL) {
rdt_free_ngroups(rdt);
ERROR(RDT_PLUGIN
": Failed to allocate memory for process name monitoring data.");
return -ENOMEM;
}
#endif
}

return 0;
Expand All @@ -698,7 +706,7 @@ static int rdt_config_ngroups(rdt_ctx_t *rdt, const oconfig_item_t *item) {
* 0 on success. Negative number on error.
*/
static int rdt_refresh_ngroup(rdt_name_group_t *ngroup,
struct pqos_mon_data *group_mon_data) {
struct pqos_mon_data **group_mon_data) {

int result = 0;

Expand Down Expand Up @@ -743,9 +751,15 @@ static int rdt_refresh_ngroup(rdt_name_group_t *ngroup,
/* no pids are monitored for this group yet: start monitoring */
if (0 == ngroup->monitored_pids_count) {

#if PQOS_VERSION >= 40600
int start_result =
pqos_mon_start_pids2(added_pids.size, added_pids.pids, ngroup->events,
(void *)ngroup->desc, group_mon_data);
#else
int start_result =
pqos_mon_start_pids(added_pids.size, added_pids.pids, ngroup->events,
(void *)ngroup->desc, group_mon_data);
(void *)ngroup->desc, *group_mon_data);
#endif
if (PQOS_RETVAL_OK == start_result) {
ngroup->monitored_pids_count = added_pids.size;
} else {
Expand All @@ -759,7 +773,7 @@ static int rdt_refresh_ngroup(rdt_name_group_t *ngroup,
} else {

int add_result =
pqos_mon_add_pids(added_pids.size, added_pids.pids, group_mon_data);
pqos_mon_add_pids(added_pids.size, added_pids.pids, *group_mon_data);
if (PQOS_RETVAL_OK == add_result)
ngroup->monitored_pids_count += added_pids.size;
else {
Expand All @@ -777,7 +791,7 @@ static int rdt_refresh_ngroup(rdt_name_group_t *ngroup,
/* all pids are removed: stop monitoring */
if (removed_pids.size == ngroup->monitored_pids_count) {
/* all pids for this group are lost: stop monitoring */
int stop_result = pqos_mon_stop(group_mon_data);
int stop_result = pqos_mon_stop(*group_mon_data);
if (PQOS_RETVAL_OK != stop_result) {
ERROR(RDT_PLUGIN ": rdt_refresh_ngroup: \'%s\'. Error [%d] while "
"STOPPING monitoring",
Expand All @@ -788,7 +802,7 @@ static int rdt_refresh_ngroup(rdt_name_group_t *ngroup,
ngroup->monitored_pids_count = 0;
} else {
int remove_result = pqos_mon_remove_pids(
removed_pids.size, removed_pids.pids, group_mon_data);
removed_pids.size, removed_pids.pids, *group_mon_data);
if (PQOS_RETVAL_OK == remove_result) {
ngroup->monitored_pids_count -= removed_pids.size;
} else {
Expand Down Expand Up @@ -818,7 +832,7 @@ static int rdt_refresh_ngroup(rdt_name_group_t *ngroup,
*/
DEBUG(RDT_PLUGIN ": rdt_refresh_ngroup: \'%s\' group RESET after error.",
ngroup->desc);
pqos_mon_stop(group_mon_data);
pqos_mon_stop(*group_mon_data);
for (size_t i = 0; i < ngroup->num_names; ++i)
if (ngroup->proc_pids[i]->curr)
ngroup->proc_pids[i]->curr->size = 0;
Expand Down Expand Up @@ -897,7 +911,7 @@ static int read_pids_data() {

for (size_t i = 0; i < g_rdt->num_ngroups; i++) {
int refresh_result =
rdt_refresh_ngroup(&(g_rdt->ngroups[i]), g_rdt->pngroups[i]);
rdt_refresh_ngroup(&(g_rdt->ngroups[i]), &(g_rdt->pngroups[i]));

if (0 != refresh_result) {
ERROR(RDT_PLUGIN ": read_pids_data: NGroup %zu refresh failed. Error: %d",
Expand Down Expand Up @@ -964,7 +978,7 @@ static void rdt_init_pids_monitoring() {

for (size_t group_idx = 0; group_idx < g_rdt->num_ngroups; group_idx++) {
int refresh_result = rdt_refresh_ngroup(&(g_rdt->ngroups[group_idx]),
g_rdt->pngroups[group_idx]);
&(g_rdt->pngroups[group_idx]));
if (0 != refresh_result)
ERROR(RDT_PLUGIN ": Initial refresh of group %zu failed. Error: %d",
group_idx, refresh_result);
Expand All @@ -980,9 +994,13 @@ static void rdt_init_pids_monitoring() {
*/
static void rdt_free_cgroups(void) {
config_cores_cleanup(&g_rdt->cores);
#if PQOS_VERSION >= 40600
/* no op: memory is freed by pqos_mon_stop(). */
#else
for (int i = 0; i < RDT_MAX_CORES; i++) {
sfree(g_rdt->pcgroups[i]);
}
#endif
g_rdt->cores.num_cgroups = 0;
}

Expand Down Expand Up @@ -1084,12 +1102,16 @@ static int rdt_config_cgroups(oconfig_item_t *item) {
}
}

#if PQOS_VERSION >= 40600
/* no op: memory will be allocated by pqos_mon_start_cores(). */
#else
g_rdt->pcgroups[i] = calloc(1, sizeof(*g_rdt->pcgroups[i]));
if (g_rdt->pcgroups[i] == NULL) {
rdt_free_cgroups();
ERROR(RDT_PLUGIN ": Failed to allocate memory for monitoring data.");
return -ENOMEM;
}
#endif
}

return 0;
Expand Down Expand Up @@ -1272,8 +1294,7 @@ static int read_cores_data() {
}
DEBUG(RDT_PLUGIN ": read_cores_data: Cores data poll");

int ret =
pqos_mon_poll(&g_rdt->pcgroups[0], (unsigned)g_rdt->cores.num_cgroups);
int ret = pqos_mon_poll(g_rdt->pcgroups, (unsigned)g_rdt->cores.num_cgroups);
if (ret != PQOS_RETVAL_OK) {
ERROR(RDT_PLUGIN ": read_cores_data: Failed to poll monitoring data for "
"cores. Error [%d].",
Expand Down Expand Up @@ -1320,9 +1341,15 @@ static void rdt_init_cores_monitoring() {
for (size_t i = 0; i < g_rdt->cores.num_cgroups; i++) {
core_group_t *cg = g_rdt->cores.cgroups + i;

#if PQOS_VERSION >= 40600
int mon_start_result =
pqos_mon_start_cores(cg->num_cores, cg->cores, g_rdt->events[i],
(void *)cg->desc, &g_rdt->pcgroups[i]);
#else
int mon_start_result =
pqos_mon_start(cg->num_cores, cg->cores, g_rdt->events[i],
(void *)cg->desc, g_rdt->pcgroups[i]);
#endif

if (mon_start_result != PQOS_RETVAL_OK)
ERROR(RDT_PLUGIN
Expand Down Expand Up @@ -1367,13 +1394,16 @@ static int rdt_shutdown(void) {

/* Stop monitoring cores */
for (size_t i = 0; i < g_rdt->cores.num_cgroups; i++) {
/* In pqos 4.6.0 and later this frees memory */
pqos_mon_stop(g_rdt->pcgroups[i]);
}

/* Stop pids monitoring */
#ifdef LIBPQOS2
for (size_t i = 0; i < g_rdt->num_ngroups; i++)
for (size_t i = 0; i < g_rdt->num_ngroups; i++) {
/* In pqos 4.6.0 and later this frees memory */
pqos_mon_stop(g_rdt->pngroups[i]);
}
#endif

ret = pqos_fini();
Expand Down

0 comments on commit b0d7a29

Please sign in to comment.