X-Git-Url: https://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-user-ns.c;h=bbd689dfa15d64ab699fd2329ca4758c246b2512;hp=85153db230ac446844eb0547cd179861cee8a27c;hb=437d5aa59380583ce1cd14d394a53b398be1275d;hpb=d96a4a7a78319be3386b57d9068817e9ffac2a24

diff --git a/src/lttng-context-user-ns.c b/src/lttng-context-user-ns.c
index 85153db2..bbd689df 100644
--- a/src/lttng-context-user-ns.c
+++ b/src/lttng-context-user-ns.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/user_namespace.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/namespace.h>
@@ -33,7 +34,7 @@ size_t user_ns_get_size(size_t offset)
 }
 
 static
-void user_ns_record(struct lttng_ctx_field *field,
+void user_ns_record(struct lttng_kernel_ctx_field *field,
 		 struct lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -47,7 +48,7 @@ void user_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void user_ns_get_value(struct lttng_ctx_field *field,
+void user_ns_get_value(struct lttng_kernel_ctx_field *field,
 		struct lttng_probe_ctx *lttng_probe_ctx,
 		union lttng_ctx_value *value)
 {
@@ -59,31 +60,25 @@ void user_ns_get_value(struct lttng_ctx_field *field,
 	value->s64 = user_ns_inum;
 }
 
-int lttng_add_user_ns_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("user_ns",
+		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
+		false, false, false),
+	user_ns_get_size,
+	NULL,
+	user_ns_record,
+	user_ns_get_value,
+	NULL, NULL);
+
+int lttng_add_user_ns_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, "user_ns")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "user_ns";
-	field->event_field.type.type = lttng_kernel_type_integer;
-	field->event_field.type.u.integer.size = sizeof(unsigned int) * CHAR_BIT;
-	field->event_field.type.u.integer.alignment = lttng_alignof(unsigned int) * CHAR_BIT;
-	field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
-	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 = user_ns_get_size;
-	field->record = user_ns_record;
-	field->get_value = user_ns_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_user_ns_to_ctx);