X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-procname.c;h=a2e07453a48c1f00cf09f342a4ad375745916bec;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=fb5c36b8314390742e63670597bf21b756902c50;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=lttng-modules.git

diff --git a/src/lttng-context-procname.c b/src/lttng-context-procname.c
index fb5c36b8..a2e07453 100644
--- a/src/lttng-context-procname.c
+++ b/src/lttng-context-procname.c
@@ -11,13 +11,14 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 #include <lttng/endian.h>
 
 static
-size_t procname_get_size(size_t offset)
+size_t procname_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -32,46 +33,38 @@ size_t procname_get_size(size_t offset)
  * could lead to crash in IRQ context and deadlock of the lockdep tracer.
  */
 static
-void procname_record(struct lttng_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void procname_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
-	chan->ops->event_write(ctx, current->comm, sizeof(current->comm));
+	chan->ops->event_write(ctx, current->comm, sizeof(current->comm), 1);
 }
 
 static
-void procname_get_value(struct lttng_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void procname_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
-	value->str = current->comm;
+	value->u.str = current->comm;
 }
 
-static const struct lttng_type procname_array_elem_type =
-	__type_integer(char, 0, 0, -1, __BYTE_ORDER, 10, UTF8);
+static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
+	lttng_kernel_static_event_field("procname",
+		lttng_kernel_static_type_array_text(sizeof(current->comm)),
+		false, false, false),
+	procname_get_size,
+	procname_record,
+	procname_get_value,
+	NULL, NULL);
 
-int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_procname_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, "procname")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "procname";
-	field->event_field.type.atype = atype_array_nestable;
-	field->event_field.type.u.array_nestable.elem_type = &procname_array_elem_type;
-	field->event_field.type.u.array_nestable.length = sizeof(current->comm);
-	field->event_field.type.u.array_nestable.alignment = 0;
-
-	field->get_size = procname_get_size;
-	field->record = procname_record;
-	field->get_value = procname_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_procname_to_ctx);