X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-context-mnt-ns.c;h=cc41dc7d489380ca89c69c2bfa8e2047598bb5a7;hb=9f881196ed338466afb648a679e17160c30e8761;hp=7f215a8a1500b5e998e14934124d18e0fa972c76;hpb=28cbcb59855c099a89b02054b15b45ee3ad6a52a;p=lttng-modules.git

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index 7f215a8a..cc41dc7d 100644
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -13,10 +13,10 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <linux/nsproxy.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
 #if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
@@ -25,7 +25,7 @@
 #include <../fs/mount.h>
 
 static
-size_t mnt_ns_get_size(size_t offset)
+size_t mnt_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -35,9 +35,9 @@ size_t mnt_ns_get_size(size_t offset)
 }
 
 static
-void mnt_ns_record(struct lttng_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	unsigned int mnt_ns_inum = 0;
 
@@ -49,16 +49,15 @@ void mnt_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum;
+		mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(mnt_ns_inum));
-	chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum));
+	chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum), lttng_alignof(mnt_ns_inum));
 }
 
 static
-void mnt_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void mnt_ns_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	unsigned int mnt_ns_inum = 0;
 
@@ -70,36 +69,29 @@ void mnt_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum;
+		mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum;
 
-	value->s64 = mnt_ns_inum;
+	value->u.s64 = mnt_ns_inum;
 }
 
-int lttng_add_mnt_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("mnt_ns",
+		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
+		false, false),
+	mnt_ns_get_size,
+	mnt_ns_record,
+	mnt_ns_get_value,
+	NULL, NULL);
+
+int lttng_add_mnt_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, "mnt_ns")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "mnt_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 = mnt_ns_get_size;
-	field->record = mnt_ns_record;
-	field->get_value = mnt_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_mnt_ns_to_ctx);