Move alignment into event write callback

[lttng-modules.git] / src / lttng-context-preemptible.c

diff --git a/src/lttng-context-preemptible.c b/src/lttng-context-preemptible.c
index c6203a3c92d1b0ccd1dbcc8728ace8c890f50a98..11c15792933d612ed40e1bbf6dd68d9ae6469ac9 100644 (file)
--- a/src/lttng-context-preemptible.c
+++ b/src/lttng-context-preemptible.c
@@ -12,6 +12,7 @@
 #include <linux/sched.h>
 #include <linux/irqflags.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
@@ -25,7 +26,7 @@
 #define LTTNG_PREEMPT_DISABLE_NESTING  2
 
 static
-size_t preemptible_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t preemptible_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -35,9 +36,9 @@ size_t preemptible_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_
 }
 
 static
-void preemptible_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
-               struct lttng_channel *chan)
+void preemptible_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
+               struct lttng_kernel_channel_buffer *chan)
 {
        int pc = preempt_count();
        uint8_t preemptible = 0;
@@ -45,13 +46,12 @@ void preemptible_record(void *priv, struct lttng_probe_ctx *probe_ctx,
        WARN_ON_ONCE(pc < LTTNG_PREEMPT_DISABLE_NESTING);
        if (pc == LTTNG_PREEMPT_DISABLE_NESTING)
                preemptible = 1;
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(preemptible));
-       chan->ops->event_write(ctx, &preemptible, sizeof(preemptible));
+       chan->ops->event_write(ctx, &preemptible, sizeof(preemptible), lttng_alignof(preemptible));
 }
 
 static
 void preemptible_get_value(void *priv,
-               struct lttng_probe_ctx *lttng_probe_ctx,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
        int pc = preempt_count();