X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-pid-ns.c;h=fa66b1dda277c7549c38fb57e6feec0b5837bf06;hb=0e41488f1d347fe2f4988acc4b7c63ee02fe4026;hp=41c15cb531632f158eeeb581e901259e003336ba;hpb=2dc781e02eb156a76554ada092a181ab2916db57;p=lttng-modules.git

diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c
index 41c15cb5..fa66b1dd 100644
--- a/src/lttng-context-pid-ns.c
+++ b/src/lttng-context-pid-ns.c
@@ -17,14 +17,13 @@
 #include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
 #include <lttng/tracer.h>
 
 #if defined(CONFIG_PID_NS) && \
 	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t pid_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t pid_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -34,9 +33,9 @@ size_t pid_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off
 }
 
 static
-void pid_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void pid_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	struct pid_namespace *ns;
 	unsigned int pid_ns_inum = 0;
@@ -49,15 +48,14 @@ void pid_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
 	ns = task_active_pid_ns(current);
 
 	if (ns)
-		pid_ns_inum = ns->lttng_ns_inum;
+		pid_ns_inum = ns->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns_inum));
-	chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum));
+	chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum), lttng_alignof(pid_ns_inum));
 }
 
 static
 void pid_ns_get_value(void *priv,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
 	struct pid_namespace *ns;
@@ -71,7 +69,7 @@ void pid_ns_get_value(void *priv,
 	ns = task_active_pid_ns(current);
 
 	if (ns)
-		pid_ns_inum = ns->lttng_ns_inum;
+		pid_ns_inum = ns->ns.inum;
 
 	value->u.s64 = pid_ns_inum;
 }
@@ -79,7 +77,7 @@ void pid_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("pid_ns",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	pid_ns_get_size,
 	pid_ns_record,
 	pid_ns_get_value,