Refactoring: type description structures

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

diff --git a/src/lttng-context-pid.c b/src/lttng-context-pid.c
index c52973bfc48f0e629d4750b8377dc1691cbd5e60..6f613725aad4815791616637ed3ef2a5e470fe52 100644 (file)
--- a/src/lttng-context-pid.c
+++ b/src/lttng-context-pid.c
@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
@@ -26,7 +27,7 @@ size_t pid_get_size(size_t offset)
 }
 
 static
-void pid_record(struct lttng_ctx_field *field,
+void pid_record(struct lttng_kernel_ctx_field *field,
                struct lib_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
@@ -38,37 +39,31 @@ void pid_record(struct lttng_ctx_field *field,
 }
 
 static
-void pid_get_value(struct lttng_ctx_field *field,
+void pid_get_value(struct lttng_kernel_ctx_field *field,
                struct lttng_probe_ctx *lttng_probe_ctx,
                union lttng_ctx_value *value)
 {
        value->s64 = task_tgid_nr(current);
 }
 
-int lttng_add_pid_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("pid",
+               lttng_kernel_static_type_integer_from_type(pid_t, __BYTE_ORDER, 10),
+               false, false, false),
+       pid_get_size,
+       NULL,
+       pid_record,
+       pid_get_value,
+       NULL, NULL);
+
+int lttng_add_pid_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, "pid")) {
-               lttng_remove_context_field(ctx, field);
+       if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
                return -EEXIST;
-       }
-       field->event_field.name = "pid";
-       field->event_field.type.type = lttng_kernel_type_integer;
-       field->event_field.type.u.integer.size = sizeof(pid_t) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(pid_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 = pid_get_size;
-       field->record = pid_record;
-       field->get_value = pid_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_pid_to_ctx);