X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-context-ipc-ns.c;h=28108a0f543d6fab46e806c7d57ef20003e49760;hb=HEAD;hp=162fac59ec3ad7f1013a917c1065add5d4a8f854;hpb=5f4c791e2ad2c814101ccdb500e65543f2792c41;p=lttng-modules.git

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index 162fac59..28108a0f 100644
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -9,21 +9,20 @@
  *
  */
 
+#ifdef CONFIG_IPC_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/ipc_namespace.h>
 #include <lttng/events.h>
+#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_IPC_NS) && \
-	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
-size_t ipc_ns_get_size(size_t offset)
+size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -33,9 +32,9 @@ size_t ipc_ns_get_size(size_t offset)
 }
 
 static
-void ipc_ns_record(struct lttng_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void ipc_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 ipc_ns_inum = 0;
 
@@ -47,16 +46,15 @@ void ipc_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+		ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum));
-	chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum));
+	chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum), lttng_alignof(ipc_ns_inum));
 }
 
 static
-void ipc_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void ipc_ns_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	unsigned int ipc_ns_inum = 0;
 
@@ -68,36 +66,29 @@ void ipc_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+		ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
-	value->s64 = ipc_ns_inum;
+	value->u.s64 = ipc_ns_inum;
 }
 
-int lttng_add_ipc_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("ipc_ns",
+		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
+		false, false),
+	ipc_ns_get_size,
+	ipc_ns_record,
+	ipc_ns_get_value,
+	NULL, NULL);
+
+int lttng_add_ipc_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, "ipc_ns")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "ipc_ns";
-	field->event_field.type.atype = atype_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_encode_none;
-	field->get_size = ipc_ns_get_size;
-	field->record = ipc_ns_record;
-	field->get_value = ipc_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_ipc_ns_to_ctx);