X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-perf-counters.c;h=72e920afbba137fa138caa4a1b5ae9e5bb6bbc28;hb=6c8c025bf7552b6073c5c1884e1493badd842f42;hp=75be9bf96491cc7716958bff42225cfef20f8141;hpb=437d5aa59380583ce1cd14d394a53b398be1275d;p=lttng-modules.git

diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c
index 75be9bf9..72e920af 100644
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -14,13 +14,14 @@
 #include <linux/string.h>
 #include <linux/cpu.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/perf.h>
 #include <lttng/tracer.h>
 
 static
-size_t perf_counter_get_size(size_t offset)
+size_t perf_counter_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -30,15 +31,15 @@ size_t perf_counter_get_size(size_t offset)
 }
 
 static
-void perf_counter_record(struct lttng_kernel_ctx_field *field,
-			 struct lib_ring_buffer_ctx *ctx,
+void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+			 struct lttng_kernel_ring_buffer_ctx *ctx,
 			 struct lttng_channel *chan)
 {
-	struct lttng_perf_counter_field *perf_field = field->priv;
+	struct lttng_perf_counter_field *perf_field = (struct lttng_perf_counter_field *) priv;
 	struct perf_event *event;
 	uint64_t value;
 
-	event = perf_field->e[ctx->cpu];
+	event = perf_field->e[ctx->priv.reserve_cpu];
 	if (likely(event)) {
 		if (unlikely(event->state == PERF_EVENT_STATE_ERROR)) {
 			value = 0;
@@ -77,9 +78,9 @@ void overflow_callback(struct perf_event *event, int nmi,
 #endif
 
 static
-void lttng_destroy_perf_counter_ctx_field(struct lttng_kernel_ctx_field *field)
+void lttng_destroy_perf_counter_ctx_field(void *priv)
 {
-	struct lttng_perf_counter_field *perf_field = field->priv;
+	struct lttng_perf_counter_field *perf_field = priv;
 	struct perf_event **events = perf_field->e;
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
@@ -223,7 +224,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 				  const char *name,
 				  struct lttng_kernel_ctx **ctx)
 {
-	struct lttng_kernel_ctx_field ctx_field;
+	struct lttng_kernel_ctx_field ctx_field = { 0 };
 	struct lttng_kernel_event_field *event_field;
 	struct lttng_perf_counter_field *perf_field;
 	struct perf_event **events;