X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-interruptible.c;h=9fbf266d5b76522a3949cfbac758366a4525c13d;hp=4bc4d8d715f71ed63e3e765b6ab35c78a5c0f744;hb=HEAD;hpb=12bb2edb6ed3e96d3299a979e49b828f2b17dcb2

diff --git a/src/lttng-context-interruptible.c b/src/lttng-context-interruptible.c
index 4bc4d8d7..2b900bb5 100644
--- a/src/lttng-context-interruptible.c
+++ b/src/lttng-context-interruptible.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>
@@ -21,7 +22,7 @@
  */
 
 static
-size_t interruptible_get_size(size_t offset)
+size_t interruptible_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -31,51 +32,43 @@ size_t interruptible_get_size(size_t offset)
 }
 
 static
-void interruptible_record(struct lttng_ctx_field *field,
-		struct lib_ring_buffer_ctx *ctx,
-		struct lttng_channel *chan)
+void interruptible_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_probe_ctx *lttng_probe_ctx = ctx->priv;
+	struct lttng_kernel_probe_ctx *lttng_probe_ctx = ctx->probe_ctx;
 	int8_t interruptible = lttng_probe_ctx->interruptible;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(interruptible));
-	chan->ops->event_write(ctx, &interruptible, sizeof(interruptible));
+	chan->ops->event_write(ctx, &interruptible, sizeof(interruptible), lttng_alignof(interruptible));
 }
 
 static
-void interruptible_get_value(struct lttng_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void interruptible_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	int8_t interruptible = lttng_probe_ctx->interruptible;
 
-	value->s64 = interruptible;
+	value->u.s64 = interruptible;
 }
 
-int lttng_add_interruptible_to_ctx(struct lttng_ctx **ctx)
+static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
+	lttng_kernel_static_event_field("interruptible",
+		lttng_kernel_static_type_integer_from_type(int8_t, __BYTE_ORDER, 10),
+		false, false),
+	interruptible_get_size,
+	interruptible_record,
+	interruptible_get_value,
+	NULL, NULL);
+
+int lttng_add_interruptible_to_ctx(struct lttng_kernel_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	int ret;
 
-	field = lttng_append_context(ctx);
-	if (!field)
-		return -ENOMEM;
-	if (lttng_find_context(*ctx, "interruptible")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "interruptible";
-	field->event_field.type.type = lttng_kernel_type_integer;
-	field->event_field.type.u.integer.size = sizeof(int8_t) * CHAR_BIT;
-	field->event_field.type.u.integer.alignment = lttng_alignof(int8_t) * CHAR_BIT;
-	field->event_field.type.u.integer.signedness = lttng_is_signed_type(int8_t);
-	field->event_field.type.u.integer.reverse_byte_order = 0;
-	field->event_field.type.u.integer.base = 10;
-	field->event_field.type.u.integer.encoding = lttng_encode_none;
-	field->get_size = interruptible_get_size;
-	field->record = interruptible_record;
-	field->get_value = interruptible_get_value;
-	lttng_context_update(*ctx);
+	ret = lttng_kernel_context_append(ctx, ctx_field);
 	wrapper_vmalloc_sync_mappings();
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(lttng_add_interruptible_to_ctx);