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 0e67b250a524147ce8881ab71c7c6b42edd11663..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(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_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,48 +46,40 @@ void preemptible_record(struct lttng_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_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;
 }
 
-int lttng_add_preemptible_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("preemptible",
+               lttng_kernel_static_type_integer_from_type(uint8_t, __BYTE_ORDER, 10),
+               false, false, false),
+       preemptible_get_size,
+       preemptible_record,
+       preemptible_get_value,
+       NULL, NULL);
+
+int lttng_add_preemptible_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, "preemptible")) {
-               lttng_remove_context_field(ctx, field);
+       if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
                return -EEXIST;
-       }
-       field->event_field.name = "preemptible";
-       field->event_field.type.type = lttng_kernel_type_integer;
-       field->event_field.type.u.integer.size = sizeof(uint8_t) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(uint8_t) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(uint8_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_kernel_string_encoding_none;
-       field->get_size = preemptible_get_size;
-       field->record = preemptible_record;
-       field->get_value = preemptible_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_preemptible_to_ctx);