X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-procname.c;h=8e4bbf97b52bb8485cc2f7b99c252a247bdb0f5a;hb=ceabb767180e064629b5a9ab4ed14449da864763;hp=c6bc6468004f1b9e1d1251acf637d146eea3e8d7;hpb=c26fddc2d5dca76292182857908a0307d91863b6;p=lttng-modules.git

diff --git a/lttng-context-procname.c b/lttng-context-procname.c
index c6bc6468..8e4bbf97 100644
--- a/lttng-context-procname.c
+++ b/lttng-context-procname.c
@@ -1,19 +1,20 @@
-/*
- * (C) Copyright	2009-2011 -
- * 		Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
+ * lttng-context-procname.c
  *
  * LTTng procname context.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include "ltt-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "ltt-tracer.h"
+#include <lttng-events.h>
+#include <wrapper/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)
@@ -33,11 +34,22 @@ size_t procname_get_size(size_t offset)
 static
 void procname_record(struct lttng_ctx_field *field,
 		 struct lib_ring_buffer_ctx *ctx,
-		 struct ltt_channel *chan)
+		 struct lttng_channel *chan)
 {
 	chan->ops->event_write(ctx, current->comm, sizeof(current->comm));
 }
 
+static
+void procname_get_value(struct lttng_ctx_field *field,
+		struct lttng_probe_ctx *lttng_probe_ctx,
+		union lttng_ctx_value *value)
+{
+	value->str = current->comm;
+}
+
+static const struct lttng_type procname_array_elem_type =
+	__type_integer(char, 0, 0, -1, __BYTE_ORDER, 10, UTF8);
+
 int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
@@ -50,23 +62,16 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
 		return -EEXIST;
 	}
 	field->event_field.name = "procname";
-	field->event_field.type.atype = atype_array;
-	field->event_field.type.u.array.elem_type.atype = atype_integer;
-	field->event_field.type.u.array.elem_type.u.basic.integer.size = sizeof(char) * CHAR_BIT;
-	field->event_field.type.u.array.elem_type.u.basic.integer.alignment = ltt_alignof(char) * CHAR_BIT;
-	field->event_field.type.u.array.elem_type.u.basic.integer.signedness = is_signed_type(char);
-	field->event_field.type.u.array.elem_type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.array.elem_type.u.basic.integer.base = 10;
-	field->event_field.type.u.array.elem_type.u.basic.integer.encoding = lttng_encode_UTF8;
-	field->event_field.type.u.array.length = sizeof(current->comm);
+	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);
 	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_procname_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");