**/
#include "collectd.h"
-#include "common.h"
+#include "utils/common/common.h"
-#include "utils_config_cores.h"
+#include "utils/config_cores/config_cores.h"
#include <jevents.h>
#include <jsession.h>
typedef struct event_info event_info_t;
struct intel_pmu_ctx_s {
- _Bool hw_cache_events;
- _Bool kernel_pmu_events;
- _Bool sw_events;
+ bool hw_cache_events;
+ bool kernel_pmu_events;
+ bool sw_events;
char event_list_fn[PATH_MAX];
char **hw_events;
size_t hw_events_count;
DEBUG(PMU_PLUGIN ": software_events : %d", g_ctx.sw_events);
for (size_t i = 0; i < g_ctx.hw_events_count; i++) {
- DEBUG(PMU_PLUGIN ": hardware_events[%zu]: %s", i, g_ctx.hw_events[i]);
+ DEBUG(PMU_PLUGIN ": hardware_events[%" PRIsz "]: %s", i,
+ g_ctx.hw_events[i]);
}
}
return -EINVAL;
}
- g_ctx.hw_events = calloc(ci->values_num, sizeof(char *));
+ g_ctx.hw_events = calloc(ci->values_num, sizeof(*g_ctx.hw_events));
if (g_ctx.hw_events == NULL) {
ERROR(PMU_PLUGIN ": Failed to allocate hw events.");
return -ENOMEM;
/* Allocate memory for event struct that contains array of efd structs
for all cores */
struct event *e =
- calloc(sizeof(struct event) + sizeof(struct efd) * el->num_cpus, 1);
+ calloc(1, sizeof(struct event) + sizeof(struct efd) * el->num_cpus);
if (e == NULL) {
ERROR(PMU_PLUGIN ": Failed to allocate event structure");
return -ENOMEM;
/* Allocate memory for event struct that contains array of efd structs
for all cores */
struct event *e =
- calloc(sizeof(struct event) + sizeof(struct efd) * el->num_cpus, 1);
+ calloc(1, sizeof(struct event) + sizeof(struct efd) * el->num_cpus);
if (e == NULL) {
free(events);
return -ENOMEM;