Move alignment into event write callback

[lttng-modules.git] / src / lttng-context-perf-counters.c

diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c
index e637bb75ca94c3ea2c991871ba2ce40617894f03..b0227d474e4d5388138bf3e6ae36bc33eaf75fec 100644 (file)
--- 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,
-                        struct lttng_channel *chan)
+void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                        struct lttng_kernel_ring_buffer_ctx *ctx,
+                        struct lttng_kernel_channel_buffer *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;
@@ -56,8 +57,7 @@ void perf_counter_record(struct lttng_kernel_ctx_field *field,
                 */
                value = 0;
        }
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(value));
-       chan->ops->event_write(ctx, &value, sizeof(value));
+       chan->ops->event_write(ctx, &value, sizeof(value), lttng_alignof(value));
 }
 
 #if defined(CONFIG_PERF_EVENTS) && (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0))
@@ -77,9 +77,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))