X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fintel_rdt.c;h=e3538993a257f9381b3c1f2f522451c4623f6108;hb=8d772b8afe712ce3c43b82492b7d18aedaa1b62b;hp=df9c9c4412410a09d8faedd890377898641eaf0f;hpb=e1ec3684a913756f605fb1193dfcfe167415d49e;p=collectd.git diff --git a/src/intel_rdt.c b/src/intel_rdt.c index df9c9c44..e3538993 100644 --- a/src/intel_rdt.c +++ b/src/intel_rdt.c @@ -23,30 +23,106 @@ * * Authors: * Serhiy Pshyk + * Starzyk, Mateusz + * Wojciech Andralojc **/ #include "collectd.h" -#include "common.h" -#include "utils_config_cores.h" - +#include "utils/common/common.h" +#include "utils/config_cores/config_cores.h" #include #define RDT_PLUGIN "intel_rdt" +/* PQOS API STUB + * In future: Start monitoring for PID group. For perf grouping will be added. + * Currently: Start monitoring only for the first PID. + */ +__attribute__((unused)) static int +pqos_mon_start_pids(const unsigned num_pids, const pid_t *pids, + const enum pqos_mon_event event, void *context, + struct pqos_mon_data *group) { + + assert(num_pids > 0); + assert(pids); + return pqos_mon_start_pid(pids[0], event, context, group); +} + +/* PQOS API STUB + * In future: Add PIDs to the monitoring group. Supported for resctrl monitoring + * only. + * Currently: Does nothing. + */ +__attribute__((unused)) static int +pqos_mon_add_pids(const unsigned num_pids, const pid_t *pids, void *context, + struct pqos_mon_data *group) { + return PQOS_RETVAL_OK; +} + +/* PQOS API STUB + * In future: Remove PIDs from the monitoring group. Supported for resctrl + * monitoring only. + * Currently: Does nothing. + */ +__attribute__((unused)) static int +pqos_mon_remove_pids(const unsigned num_pids, const pid_t *pids, void *context, + struct pqos_mon_data *group) { + return PQOS_RETVAL_OK; +} + +#define RDT_PLUGIN "intel_rdt" + #define RDT_MAX_SOCKETS 8 #define RDT_MAX_SOCKET_CORES 64 #define RDT_MAX_CORES (RDT_MAX_SOCKET_CORES * RDT_MAX_SOCKETS) +/* + * Process name inside comm file is limited to 16 chars. + * More info here: http://man7.org/linux/man-pages/man5/proc.5.html + */ +#define RDT_MAX_NAME_LEN 16 +#define RDT_MAX_NAMES_GROUPS 64 + +#define RDT_PROC_PATH "/proc" + typedef enum { UNKNOWN = 0, CONFIGURATION_ERROR, } rdt_config_status; +/* Helper typedef for process name array + * Extra 1 char is added for string null termination. + */ +typedef char proc_comm_t[RDT_MAX_NAME_LEN + 1]; + +/* Linked one-way list of pids. */ +typedef struct pids_list_s { + pid_t pid; + struct pids_list_s *next; +} pids_list_t; + +/* Holds process name and list of pids assigned to that name */ +typedef struct proc_pids_s { + proc_comm_t proccess_name; + pids_list_t *pids; +} proc_pids_t; + +struct rdt_name_group_s { + char *desc; + size_t num_names; + char **names; + proc_pids_t *proc_pids_array; + enum pqos_mon_event events; +}; +typedef struct rdt_name_group_s rdt_name_group_t; + struct rdt_ctx_s { core_groups_list_t cores; enum pqos_mon_event events[RDT_MAX_CORES]; - struct pqos_mon_data *pgroups[RDT_MAX_CORES]; - size_t num_groups; + struct pqos_mon_data *pcgroups[RDT_MAX_CORES]; + rdt_name_group_t ngroups[RDT_MAX_NAMES_GROUPS]; + struct pqos_mon_data *pngroups[RDT_MAX_NAMES_GROUPS]; + size_t num_ngroups; const struct pqos_cpuinfo *pqos_cpu; const struct pqos_cap *pqos_cap; const struct pqos_capability *cap_mon; @@ -57,6 +133,167 @@ static rdt_ctx_t *g_rdt; static rdt_config_status g_state = UNKNOWN; +static int isdupstr(const char *names[], const size_t size, const char *name) { + for (size_t i = 0; i < size; i++) + if (strncmp(names[i], name, (size_t)RDT_MAX_NAME_LEN) == 0) + return 1; + + return 0; +} + +/* + * NAME + * strlisttoarray + * + * DESCRIPTION + * Converts string representing list of strings into array of strings. + * Allowed format is: + * name,name1,name2,name3 + * + * PARAMETERS + * `str_list' String representing list of strings. + * `names' Array to put extracted strings into. + * `names_num' Variable to put number of extracted strings. + * + * RETURN VALUE + * Number of elements placed into names. + */ +static int strlisttoarray(char *str_list, char ***names, size_t *names_num) { + char *saveptr = NULL; + + if (str_list == NULL || names == NULL) + return -EINVAL; + + for (;;) { + char *token = strtok_r(str_list, ",", &saveptr); + if (token == NULL) + break; + + str_list = NULL; + + while (isspace(*token)) + token++; + + if (*token == '\0') + continue; + + if (!(isdupstr((const char **)*names, *names_num, token))) + if (0 != strarray_add(names, names_num, token)) { + ERROR(RDT_PLUGIN ": Error allocating process name string"); + return -ENOMEM; + } + } + + return 0; +} + +/* + * NAME + * ngroup_cmp + * + * DESCRIPTION + * Function to compare names in two name groups. + * + * PARAMETERS + * `ng_a' Pointer to name group a. + * `ng_b' Pointer to name group b. + * + * RETURN VALUE + * 1 if both groups contain the same names + * 0 if none of their names match + * -1 if some but not all names match + */ +static int ngroup_cmp(const rdt_name_group_t *ng_a, + const rdt_name_group_t *ng_b) { + unsigned found = 0; + + assert(ng_a != NULL); + assert(ng_b != NULL); + + const size_t sz_a = (unsigned)ng_a->num_names; + const size_t sz_b = (unsigned)ng_b->num_names; + const char **tab_a = (const char **)ng_a->names; + const char **tab_b = (const char **)ng_b->names; + + for (size_t i = 0; i < sz_a; i++) { + for (size_t j = 0; j < sz_b; j++) + if (strncmp(tab_a[i], tab_b[j], (size_t)RDT_MAX_NAME_LEN) == 0) + found++; + } + /* if no names are the same */ + if (!found) + return 0; + /* if group contains same names */ + if (sz_a == sz_b && sz_b == (size_t)found) + return 1; + /* if not all names are the same */ + return -1; +} + +/* + * NAME + * oconfig_to_ngroups + * + * DESCRIPTION + * Function to set the descriptions and names for each process names group. + * Takes a config option containing list of strings that are used to set + * process group values. + * + * PARAMETERS + * `item' Config option containing process names groups. + * `groups' Table of process name groups to set values in. + * `max_groups' Maximum number of process name groups allowed. + * + * RETURN VALUE + * On success, the number of name groups set up. On error, appropriate + * negative error value. + */ +static int oconfig_to_ngroups(const oconfig_item_t *item, + rdt_name_group_t *groups, + const size_t max_groups) { + int index = 0; + + assert(groups != NULL); + assert(max_groups > 0); + assert(item != NULL); + + for (int j = 0; j < item->values_num; j++) { + int ret; + char value[DATA_MAX_NAME_LEN]; + + if ((item->values[j].value.string == NULL) || + (strlen(item->values[j].value.string) == 0)) + continue; + + sstrncpy(value, item->values[j].value.string, sizeof(value)); + + ret = strlisttoarray(value, &groups[index].names, &groups[index].num_names); + if (ret != 0 || groups[index].num_names == 0) { + ERROR(RDT_PLUGIN ": Error parsing process names group (%s)", + item->values[j].value.string); + return -EINVAL; + } + + /* set group description info */ + groups[index].desc = sstrdup(item->values[j].value.string); + if (groups[index].desc == NULL) { + ERROR(RDT_PLUGIN ": Error allocating name group description"); + return -ENOMEM; + } + + groups[index].proc_pids_array = NULL; + + index++; + + if (index >= (const int)max_groups) { + WARNING(RDT_PLUGIN ": Too many process names groups configured"); + return index; + } + } + + return index; +} + #if COLLECT_DEBUG static void rdt_dump_cgroups(void) { char cores[RDT_MAX_CORES * 4]; @@ -65,13 +302,13 @@ static void rdt_dump_cgroups(void) { return; DEBUG(RDT_PLUGIN ": Core Groups Dump"); - DEBUG(RDT_PLUGIN ": groups count: %" PRIsz, g_rdt->num_groups); + DEBUG(RDT_PLUGIN ": groups count: %" PRIsz, g_rdt->cores.num_cgroups); - for (size_t i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->cores.num_cgroups; i++) { core_group_t *cgroup = g_rdt->cores.cgroups + i; memset(cores, 0, sizeof(cores)); - for (int 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]); } @@ -85,6 +322,31 @@ static void rdt_dump_cgroups(void) { return; } +static void rdt_dump_ngroups(void) { + + char names[DATA_MAX_NAME_LEN]; + + if (g_rdt == NULL) + return; + + DEBUG(RDT_PLUGIN ": Process Names Groups Dump"); + DEBUG(RDT_PLUGIN ": groups count: %" PRIsz, g_rdt->num_ngroups); + + for (size_t i = 0; i < g_rdt->num_ngroups; i++) { + memset(names, 0, sizeof(names)); + for (size_t j = 0; j < g_rdt->ngroups[i].num_names; j++) + snprintf(names + strlen(names), sizeof(names) - strlen(names) - 1, " %s", + g_rdt->ngroups[i].names[j]); + + DEBUG(RDT_PLUGIN ": group[%d]:", (int)i); + DEBUG(RDT_PLUGIN ": description: %s", g_rdt->ngroups[i].desc); + DEBUG(RDT_PLUGIN ": process names:%s", names); + DEBUG(RDT_PLUGIN ": events: 0x%X", g_rdt->ngroups[i].events); + } + + return; +} + static inline double bytes_to_kb(const double bytes) { return bytes / 1024.0; } static inline double bytes_to_mb(const double bytes) { @@ -94,22 +356,54 @@ static inline double bytes_to_mb(const double bytes) { static void rdt_dump_data(void) { /* * CORE - monitored group of cores + * NAME - monitored group of processes * RMID - Resource Monitoring ID associated with the monitored group * LLC - last level cache occupancy * MBL - local memory bandwidth * 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->cores.num_cgroups; i++) { - const struct pqos_event_values *pv = &g_rdt->pgroups[i]->values; + const struct pqos_event_values *pv = &g_rdt->pcgroups[i]->values; double llc = bytes_to_kb(pv->llc); double mbr = bytes_to_mb(pv->mbm_remote_delta); double mbl = bytes_to_mb(pv->mbm_local_delta); DEBUG(" [%s] %8u %10.1f %10.1f %10.1f", g_rdt->cores.cgroups[i].desc, - g_rdt->pgroups[i]->poll_ctx[0].rmid, llc, mbl, mbr); + g_rdt->pcgroups[i]->poll_ctx[0].rmid, llc, mbl, mbr); + } + + DEBUG(" NAME PIDs"); + char pids[DATA_MAX_NAME_LEN]; + for (size_t i = 0; i < g_rdt->num_ngroups; ++i) { + memset(pids, 0, sizeof(pids)); + for (size_t j = 0; j < g_rdt->ngroups[i].num_names; ++j) { + pids_list_t *list = g_rdt->ngroups[i].proc_pids_array[j].pids; + while (list != NULL) { + snprintf(pids + strlen(pids), sizeof(pids) - strlen(pids) - 1, " %u", + list->pid); + list = list->next; + } + } + DEBUG(" [%s] %s", g_rdt->ngroups[i].desc, pids); + } + + DEBUG(" NAME RMID LLC[KB] MBL[MB] MBR[MB]"); + for (size_t i = 0; i < g_rdt->num_ngroups; i++) { + + if (g_rdt->pngroups[i]->poll_ctx == NULL) + continue; + + const struct pqos_event_values *pv = &g_rdt->pngroups[i]->values; + + double llc = bytes_to_kb(pv->llc); + double mbr = bytes_to_mb(pv->mbm_remote_delta); + double mbl = bytes_to_mb(pv->mbm_local_delta); + + DEBUG(" [%s] %8u %10.1f %10.1f %10.1f", g_rdt->ngroups[i].desc, + g_rdt->pngroups[i]->poll_ctx[0].rmid, llc, mbl, mbr); } } #endif /* COLLECT_DEBUG */ @@ -117,7 +411,41 @@ static void rdt_dump_data(void) { static void rdt_free_cgroups(void) { config_cores_cleanup(&g_rdt->cores); for (int i = 0; i < RDT_MAX_CORES; i++) { - sfree(g_rdt->pgroups[i]); + sfree(g_rdt->pcgroups[i]); + } +} + +static int pids_list_free(pids_list_t *list) { + assert(list); + + pids_list_t *current = list; + while (current != NULL) { + pids_list_t *previous = current; + current = current->next; + sfree(previous); + } + return 0; +} + +static void rdt_free_ngroups(void) { + for (int i = 0; i < RDT_MAX_NAMES_GROUPS; i++) { + DEBUG(RDT_PLUGIN ": Freeing \'%s\' group\'s data...", + g_rdt->ngroups[i].desc); + sfree(g_rdt->ngroups[i].desc); + strarray_free(g_rdt->ngroups[i].names, g_rdt->ngroups[i].num_names); + + if (g_rdt->ngroups[i].proc_pids_array) { + for (size_t j = 0; j < g_rdt->ngroups[i].num_names; ++j) { + if (NULL == g_rdt->ngroups[i].proc_pids_array[j].pids) + continue; + pids_list_free(g_rdt->ngroups[i].proc_pids_array[j].pids); + } + + sfree(g_rdt->ngroups[i].proc_pids_array); + } + + g_rdt->ngroups[i].num_names = 0; + sfree(g_rdt->pngroups[i]); } } @@ -167,6 +495,22 @@ static int rdt_is_core_id_valid(unsigned int core_id) { return 0; } +static int rdt_is_proc_name_valid(const char *name) { + + if (name != NULL) { + unsigned len = strlen(name); + if (len > 0 && len <= RDT_MAX_NAME_LEN) + return 1; + else { + DEBUG(RDT_PLUGIN + ": Process name \'%s\' is too long. Max supported len is %d chars.", + name, RDT_MAX_NAME_LEN); + } + } + + return 0; +} + static int rdt_config_cgroups(oconfig_item_t *item) { size_t n = 0; enum pqos_mon_event events = 0; @@ -214,9 +558,9 @@ static int rdt_config_cgroups(oconfig_item_t *item) { g_rdt->pqos_cpu->num_cores); DEBUG(RDT_PLUGIN ": Available events to monitor: %#x", events); - g_rdt->num_groups = n; - for (size_t i = 0; i < n; i++) { - for (size_t j = 0; j < i; j++) { + g_rdt->cores.num_cgroups = n; + for (int i = 0; i < n; i++) { + for (int j = 0; j < i; j++) { int found = 0; found = config_cores_cmp_cgroups(&g_rdt->cores.cgroups[j], &g_rdt->cores.cgroups[i]); @@ -228,8 +572,8 @@ static int rdt_config_cgroups(oconfig_item_t *item) { } g_rdt->events[i] = events; - g_rdt->pgroups[i] = calloc(1, sizeof(*g_rdt->pgroups[i])); - if (g_rdt->pgroups[i] == NULL) { + 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; @@ -239,6 +583,356 @@ static int rdt_config_cgroups(oconfig_item_t *item) { return 0; } +static int rdt_config_ngroups(const oconfig_item_t *item) { + int n = 0; + enum pqos_mon_event events = 0; + + if (item == NULL) { + DEBUG(RDT_PLUGIN ": ngroups_config: Invalid argument."); + return -EINVAL; + } + + DEBUG(RDT_PLUGIN ": Process names groups [%d]:", item->values_num); + for (int j = 0; j < item->values_num; j++) { + if (item->values[j].type != OCONFIG_TYPE_STRING) { + ERROR(RDT_PLUGIN + ": given process names group value is not a string [idx=%d]", + j); + return -EINVAL; + } + DEBUG(RDT_PLUGIN ": [%d]: %s", j, item->values[j].value.string); + } + + n = oconfig_to_ngroups(item, g_rdt->ngroups, RDT_MAX_NAMES_GROUPS); + if (n < 0) { + rdt_free_ngroups(); + ERROR(RDT_PLUGIN ": Error parsing process name groups configuration."); + return -EINVAL; + } + + /* validate configured process name values */ + for (int group_idx = 0; group_idx < n; group_idx++) { + for (size_t name_idx = 0; name_idx < g_rdt->ngroups[group_idx].num_names; + name_idx++) { + if (!rdt_is_proc_name_valid(g_rdt->ngroups[group_idx].names[name_idx])) { + ERROR(RDT_PLUGIN ": Process name group '%s' contains invalid name '%s'", + g_rdt->ngroups[group_idx].desc, + g_rdt->ngroups[group_idx].names[name_idx]); + rdt_free_ngroups(); + return -EINVAL; + } + } + } + + if (n == 0) { + ERROR(RDT_PLUGIN ": Empty process name groups configured."); + return -EINVAL; + } + + /* Get all available events on this platform */ + for (unsigned 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); + + DEBUG(RDT_PLUGIN ": Available events to monitor: %#x", events); + + g_rdt->num_ngroups = n; + for (int i = 0; i < n; i++) { + for (int j = 0; j < i; j++) { + int found = ngroup_cmp(&g_rdt->ngroups[j], &g_rdt->ngroups[i]); + if (found != 0) { + rdt_free_ngroups(); + ERROR(RDT_PLUGIN + ": Cannot monitor same process name in different groups."); + return -EINVAL; + } + } + + g_rdt->ngroups[i].events = events; + g_rdt->pngroups[i] = calloc(1, sizeof(*g_rdt->pngroups[i])); + if (g_rdt->pngroups[i] == NULL) { + rdt_free_ngroups(); + ERROR(RDT_PLUGIN + ": Failed to allocate memory for process name monitoring data."); + return -ENOMEM; + } + } + + return 0; +} + +/* + * NAME + * pids_list_add_pid + * + * DESCRIPTION + * Adds pid at the end of the pids list. + * Allocates memory for new pid element, it is up to user to free it. + * + * PARAMETERS + * `list' Head of target pids_list. + * `pid' Pid to be added. + * + * RETURN VALUE + * On success, returns 0. + * -1 on memory allocation error. + */ +static int pids_list_add_pid(pids_list_t **list, const pid_t pid) { + assert(list); + + pids_list_t *new_element = calloc(1, sizeof(*new_element)); + + if (new_element == NULL) { + ERROR(RDT_PLUGIN ": Alloc error\n"); + return -1; + } + new_element->pid = pid; + new_element->next = NULL; + + pids_list_t **current = list; + while (*current != NULL) { + current = &((*current)->next); + } + *current = new_element; + return 0; +} + +/* + * NAME + * pids_list_contains_pid + * + * DESCRIPTION + * Tests if pids list contains specific pid. + * + * PARAMETERS + * `list' Head of pids_list. + * `pid' Pid to be searched for. + * + * RETURN VALUE + * If PID found in list, returns 1, + * Otherwise returns 0. + */ +static int pids_list_contains_pid(pids_list_t *list, const pid_t pid) { + assert(list); + + pids_list_t *current = list; + while (current != NULL) { + if (current->pid == pid) + return 1; + current = current->next; + } + return 0; +} + +/* + * NAME + * pids_list_add_pids_list + * + * DESCRIPTION + * Adds pids list at the end of the pids list. + * Allocates memory for new pid elements, it is up to user to free it. + * Increases dst_num by a number of added PIDs. + * + * PARAMETERS + * `dst' Head of target PIDs list. + * `src' Head of source PIDs list. + * `dst_num' Variable to be increased by a number of appended PIDs. + * + * RETURN VALUE + * On success, returns 0. + * -1 on memory allocation error. + */ +static int pids_list_add_pids_list(pids_list_t **dst, pids_list_t *src, + size_t *dst_num) { + assert(dst); + assert(src); + assert(dst_num); + + pids_list_t *current = src; + int ret; + + while (current != NULL) { + ret = pids_list_add_pid(dst, current->pid); + if (0 != ret) + return ret; + + ++(*dst_num); + current = current->next; + } + + return 0; +} + +/* + * NAME + * read_proc_name + * + * DESCRIPTION + * Reads process name from given pid directory. + * Strips new-line character (\n). + * + * PARAMETERS + * `procfs_path` Path to systems proc directory (e.g. /proc) + * `pid_entry' Dirent for PID directory + * `name' Output buffer for process name, recommended proc_comm. + * `out_size' Output buffer size, recommended sizeof(proc_comm) + * + * RETURN VALUE + * On success, the number of read bytes (includes stripped \n). + * -1 on file open error + */ +static int read_proc_name(const char *procfs_path, + const struct dirent *pid_entry, char *name, + const size_t out_size) { + assert(procfs_path); + assert(pid_entry); + assert(name); + assert(out_size); + memset(name, 0, out_size); + + const char *comm_file_name = "comm"; + + char *path = ssnprintf_alloc("%s/%s/%s", procfs_path, pid_entry->d_name, + comm_file_name); + + FILE *f = fopen(path, "r"); + if (f == NULL) { + ERROR(RDT_PLUGIN ": Failed to open comm file, error: %d\n", errno); + sfree(path); + return -1; + } + size_t read_length = fread(name, sizeof(char), out_size, f); + fclose(f); + sfree(path); + /* strip new line ending */ + char *newline = strchr(name, '\n'); + if (newline) { + *newline = '\0'; + } + + return read_length; +} + +/* + * NAME + * get_pid_number + * + * DESCRIPTION + * Gets pid number for given /proc/pid directory entry or + * returns error if input directory does not hold PID information. + * + * PARAMETERS + * `entry' Dirent for PID directory + * `pid' PID number to be filled + * + * RETURN VALUE + * 0 on success. Negative number on error: + * -1: given entry is not a directory + * -2: PID conversion error + */ +static int get_pid_number(struct dirent *entry, pid_t *pid) { + char *tmp_end; /* used for strtoul error check*/ + + if (pid == NULL || entry == NULL) + return -1; + + if (entry->d_type != DT_DIR) + return -1; + + /* trying to get pid number from directory name*/ + *pid = strtoul(entry->d_name, &tmp_end, 10); + if (*tmp_end != '\0') { + return -2; /* conversion failed, not proc-pid */ + } + /* all checks passed, marking as success */ + return 0; +} + +/* + * NAME + * fetch_pids_for_procs + * + * DESCRIPTION + * Finds PIDs matching given process's names. + * Searches all PID directories in /proc fs and + * allocates memory for proc_pids structs, it is up to user to free it. + * Output array will have same element count as input array. + * + * PARAMETERS + * `procfs_path' Path to systems proc directory (e.g. /proc) + * `procs' Array of null-terminated strings with + * process' names to search for + * `procs_size' procs array element count + * `proc_pids_array' Address of pointer, under which new + * array of proc_pids will be allocated. Must be NULL. + * + * RETURN VALUE + * 0 on success. Negative number on error: + * -1: could not open /proc dir + */ +__attribute__((unused)) /* TODO: remove this attribute when PID monitoring is + implemented */ +static int +fetch_pids_for_procs(const char *procfs_path, const char **procs_names_array, + const size_t procs_names_array_size, + proc_pids_t **proc_pids_array) { + assert(procfs_path); + assert(procs_names_array); + assert(procs_names_array_size); + assert(proc_pids_array); + assert(NULL == *proc_pids_array); + + DIR *proc_dir = opendir(procfs_path); + if (proc_dir == NULL) { + ERROR(RDT_PLUGIN ": Could not open %s directory, error: %d", procfs_path, + errno); + return -1; + } + + /* Copy procs names to output array. Initialize pids list with NULL value. */ + (*proc_pids_array) = + calloc(procs_names_array_size, sizeof(**proc_pids_array)); + for (size_t i = 0; i < procs_names_array_size; ++i) { + sstrncpy((*proc_pids_array)[i].proccess_name, procs_names_array[i], + STATIC_ARRAY_SIZE((*proc_pids_array)[i].proccess_name)); + (*proc_pids_array)[i].pids = NULL; + } + + /* Go through procfs and find PIDS and their comms */ + struct dirent *entry; + while ((entry = readdir(proc_dir)) != NULL) { + + pid_t pid; + int pid_conversion = get_pid_number(entry, &pid); + if (pid_conversion < 0) + continue; + + proc_comm_t comm; + int read_result = + read_proc_name(procfs_path, entry, comm, sizeof(proc_comm_t)); + if (read_result <= 0) { + ERROR(RDT_PLUGIN ": Comm file skipped. Read result: %d", read_result); + continue; + } + + /* Try to find comm in input procs array (proc_pids_array has same names) */ + for (size_t i = 0; i < procs_names_array_size; ++i) { + if (0 == strncmp(comm, (*proc_pids_array)[i].proccess_name, + STATIC_ARRAY_SIZE(comm))) + pids_list_add_pid(&((*proc_pids_array)[i].pids), pid); + } + } + + int close_result = closedir(proc_dir); + if (0 != close_result) { + ERROR(RDT_PLUGIN ": failed to close %s directory, error: %d", procfs_path, + errno); + return -1; + } + return 0; +} + static void rdt_pqos_log(void *context, const size_t size, const char *msg) { DEBUG(RDT_PLUGIN ": %s", msg); } @@ -315,7 +1009,7 @@ static int rdt_config(oconfig_item_t *ci) { for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp("Cores", child->key) == 0) { + if (strncasecmp("Cores", child->key, (size_t)strlen("Cores")) == 0) { if (rdt_config_cgroups(child) != 0) { g_state = CONFIGURATION_ERROR; /* if we return -1 at this point collectd @@ -328,6 +1022,20 @@ static int rdt_config(oconfig_item_t *ci) { #if COLLECT_DEBUG rdt_dump_cgroups(); #endif /* COLLECT_DEBUG */ + } else if (strncasecmp("Processes", child->key, + (size_t)strlen("Processes")) == 0) { + if (rdt_config_ngroups(child) != 0) { + g_state = CONFIGURATION_ERROR; + /* if we return -1 at this point collectd + reports a failure in configuration and + aborts + */ + return (0); + } + +#if COLLECT_DEBUG + rdt_dump_ngroups(); +#endif /* COLLECT_DEBUG */ } else { ERROR(RDT_PLUGIN ": Unknown configuration parameter \"%s\".", child->key); } @@ -368,6 +1076,106 @@ static void rdt_submit_gauge(const char *cgroup, const char *type, plugin_dispatch_values(&vl); } +static int rdt_pid_list_diff(pids_list_t *prev, pids_list_t *curr, + pids_list_t **added, size_t *added_num, + pids_list_t **removed, size_t *removed_num) { + assert(prev || curr); + assert(added); + assert(removed); + + if (NULL == prev) { + /* append all PIDs from curr to added*/ + return pids_list_add_pids_list(added, curr, added_num); + } else if (NULL == curr) { + /* append all PIDs from prev to removed*/ + return pids_list_add_pids_list(removed, prev, removed_num); + } + + pids_list_t *item = prev; + while (item != NULL) { + if (0 == pids_list_contains_pid(curr, item->pid)) { + pids_list_add_pid(removed, item->pid); + ++(*removed_num); + } + item = item->next; + } + + item = curr; + while (item != NULL) { + if (0 == pids_list_contains_pid(prev, item->pid)) { + pids_list_add_pid(added, item->pid); + ++(*added_num); + } + item = item->next; + } + + return 0; +} + +static int rdt_refresh_ngroup(rdt_name_group_t *ngroup) { + if (NULL == ngroup) + return -1; + + DEBUG(RDT_PLUGIN ": rdt_refresh_ngroup: \'%s\' process names group.", + ngroup->desc); + + proc_pids_t *pids_array_prev = ngroup->proc_pids_array; + proc_pids_t *pids_array_curr = NULL; + + int fetch_result = + fetch_pids_for_procs(RDT_PROC_PATH, (const char **)ngroup->names, + ngroup->num_names, &pids_array_curr); + + if (0 != fetch_result) { + ERROR(RDT_PLUGIN ": rdt_refresh_ngroup: failed to fetch PIDs for \'%s\' " + "process names group.", + ngroup->desc); + return fetch_result; + } + + if (NULL == pids_array_prev) { + /*no PIDs info yet, just save current one for next iteration*/ + ngroup->proc_pids_array = pids_array_curr; + return 0; + } + + pids_list_t *added = NULL; + size_t added_num = 0; + + pids_list_t *removed = NULL; + size_t removed_num = 0; + + for (size_t i = 0; i < ngroup->num_names; ++i) { + if (NULL == pids_array_prev[i].pids && NULL == pids_array_curr[i].pids) + continue; + rdt_pid_list_diff(pids_array_prev[i].pids, pids_array_curr[i].pids, &added, + &added_num, &removed, &removed_num); + } + + DEBUG(RDT_PLUGIN ": rdt_refresh_ngroup: \'%s\' process names group, added: " + "%u, removed: %u.", + ngroup->desc, (unsigned)added_num, (unsigned)removed_num); + + if (added_num != 0 || removed_num != 0) { + ngroup->proc_pids_array = pids_array_curr; + + /*call pqos add and remove functions here*/ + } + + /*free prev PID lists, only if new was saved in ngroup struct*/ + if (pids_array_prev && pids_array_prev != ngroup->proc_pids_array) { + for (size_t i = 0; i < ngroup->num_names; ++i) { + if (NULL == pids_array_prev[i].pids) + continue; + pids_list_free(pids_array_prev[i].pids); + } + + sfree(pids_array_prev); + } + + return 0; +} + static int rdt_read(__attribute__((unused)) user_data_t *ud) { int ret; @@ -376,24 +1184,26 @@ static int rdt_read(__attribute__((unused)) user_data_t *ud) { return -EINVAL; } - ret = pqos_mon_poll(&g_rdt->pgroups[0], (unsigned)g_rdt->num_groups); + ret = pqos_mon_poll(&g_rdt->pcgroups[0], (unsigned)g_rdt->cores.num_cgroups); if (ret != PQOS_RETVAL_OK) { ERROR(RDT_PLUGIN ": Failed to poll monitoring data."); return -1; } + for (size_t i = 0; i < g_rdt->num_ngroups; i++) + rdt_refresh_ngroup(&g_rdt->ngroups[i]); + #if COLLECT_DEBUG rdt_dump_data(); #endif /* COLLECT_DEBUG */ - for (size_t i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->cores.num_cgroups; i++) { core_group_t *cgroup = g_rdt->cores.cgroups + i; - enum pqos_mon_event mbm_events = (PQOS_MON_EVENT_LMEM_BW | PQOS_MON_EVENT_TMEM_BW | PQOS_MON_EVENT_RMEM_BW); - const struct pqos_event_values *pv = &g_rdt->pgroups[i]->values; + const struct pqos_event_values *pv = &g_rdt->pcgroups[i]->values; /* Submit only monitored events data */ @@ -425,11 +1235,11 @@ static int rdt_init(void) { return ret; /* Start monitoring */ - for (size_t i = 0; i < g_rdt->num_groups; i++) { + for (size_t i = 0; i < g_rdt->cores.num_cgroups; i++) { core_group_t *cg = g_rdt->cores.cgroups + i; ret = pqos_mon_start(cg->num_cores, cg->cores, g_rdt->events[i], - (void *)cg->desc, g_rdt->pgroups[i]); + (void *)cg->desc, g_rdt->pcgroups[i]); if (ret != PQOS_RETVAL_OK) ERROR(RDT_PLUGIN ": Error starting monitoring group %s (pqos status=%d)", @@ -448,8 +1258,8 @@ static int rdt_shutdown(void) { return 0; /* Stop monitoring */ - for (size_t i = 0; i < g_rdt->num_groups; i++) { - pqos_mon_stop(g_rdt->pgroups[i]); + for (size_t i = 0; i < g_rdt->cores.num_cgroups; i++) { + pqos_mon_stop(g_rdt->pcgroups[i]); } ret = pqos_fini();