X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-cgroup-ns.c;h=27f00f6bd78dd7e309cad8ff0252b6bc0e39a88a;hp=bb7587ff7737f7d53b8d80def54322ef8c27f1bf;hb=HEAD;hpb=28cbcb59855c099a89b02054b15b45ee3ad6a52a

diff --git a/src/lttng-context-cgroup-ns.c b/src/lttng-context-cgroup-ns.c
index bb7587ff..27659db8 100644
--- a/src/lttng-context-cgroup-ns.c
+++ b/src/lttng-context-cgroup-ns.c
@@ -14,9 +14,9 @@
 #include <linux/sched.h>
 #include <linux/cgroup.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_CGROUPS) && \
@@ -24,7 +24,7 @@
 	 LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
 
 static
-size_t cgroup_ns_get_size(size_t offset)
+size_t cgroup_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -34,9 +34,9 @@ size_t cgroup_ns_get_size(size_t offset)
 }
 
 static
-void cgroup_ns_record(struct lttng_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void cgroup_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 cgroup_ns_inum = 0;
 
@@ -48,16 +48,15 @@ void cgroup_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum;
+		cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns_inum));
-	chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum));
+	chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum), lttng_alignof(cgroup_ns_inum));
 }
 
 static
-void cgroup_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void cgroup_ns_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
 	unsigned int cgroup_ns_inum = 0;
 
@@ -69,36 +68,29 @@ void cgroup_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum;
+		cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum;
 
-	value->s64 = cgroup_ns_inum;
+	value->u.s64 = cgroup_ns_inum;
 }
 
-int lttng_add_cgroup_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("cgroup_ns",
+		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
+		false, false),
+	cgroup_ns_get_size,
+	cgroup_ns_record,
+	cgroup_ns_get_value,
+	NULL, NULL);
+
+int lttng_add_cgroup_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, "cgroup_ns")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "cgroup_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 = cgroup_ns_get_size;
-	field->record = cgroup_ns_record;
-	field->get_value = cgroup_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_cgroup_ns_to_ctx);