X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-preemptible.c;h=11c15792933d612ed40e1bbf6dd68d9ae6469ac9;hb=758c244b6ef2113a475213f072826419585cc75a;hp=67c155a245741b1fff7f9d9905107abe89ec727d;hpb=087e3f1b33319c80a5e3dbee7a77174db55647d9;p=lttng-modules.git

diff --git a/src/lttng-context-preemptible.c b/src/lttng-context-preemptible.c
index 67c155a2..11c15792 100644
--- 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(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(size_t offset)
 }
 
 static
-void preemptible_record(struct lttng_kernel_ctx_field *field,
-		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,22 +46,21 @@ void preemptible_record(struct lttng_kernel_ctx_field *field,
 	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(struct lttng_kernel_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void preemptible_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	int pc = preempt_count();
 
 	WARN_ON_ONCE(pc < LTTNG_PREEMPT_DISABLE_NESTING);
 	if (pc == LTTNG_PREEMPT_DISABLE_NESTING)
-		value->s64 = 1;
+		value->u.s64 = 1;
 	else
-		value->s64 = 0;
+		value->u.s64 = 0;
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
@@ -68,7 +68,6 @@ static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_
 		lttng_kernel_static_type_integer_from_type(uint8_t, __BYTE_ORDER, 10),
 		false, false, false),
 	preemptible_get_size,
-	NULL,
 	preemptible_record,
 	preemptible_get_value,
 	NULL, NULL);