X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-context-tid.c;h=5a9dee54fd8f8c8c74b89541192c0567b621bf9f;hb=218585b9b0ab4586da4b6fc55c85a70b0b201151;hp=d4bedafc9370178f7f71b719304a7bed120933d6;hpb=12bb2edb6ed3e96d3299a979e49b828f2b17dcb2;p=lttng-modules.git

diff --git a/src/lttng-context-tid.c b/src/lttng-context-tid.c
index d4bedafc..5a9dee54 100644
--- a/src/lttng-context-tid.c
+++ b/src/lttng-context-tid.c
@@ -11,12 +11,13 @@
 #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>
 
 static
-size_t tid_get_size(size_t offset)
+size_t tid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -26,7 +27,7 @@ size_t tid_get_size(size_t offset)
 }
 
 static
-void tid_record(struct lttng_ctx_field *field,
+void tid_record(void *priv, struct lttng_probe_ctx *probe_ctx,
 		 struct lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -38,40 +39,33 @@ void tid_record(struct lttng_ctx_field *field,
 }
 
 static
-void tid_get_value(struct lttng_ctx_field *field,
+void tid_get_value(void *priv,
 		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+		struct lttng_ctx_value *value)
 {
 	pid_t tid;
 
 	tid = task_pid_nr(current);
-	value->s64 = tid;
+	value->u.s64 = tid;
 }
 
-int lttng_add_tid_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("tid",
+		lttng_kernel_static_type_integer_from_type(pid_t, __BYTE_ORDER, 10),
+		false, false, false),
+	tid_get_size,
+	tid_record,
+	tid_get_value,
+	NULL, NULL);
+
+int lttng_add_tid_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, "tid")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "tid";
-	field->event_field.type.type = lttng_kernel_type_integer;
-	field->event_field.type.u.integer.size = sizeof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.integer.signedness = lttng_is_signed_type(pid_t);
-	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 = tid_get_size;
-	field->record = tid_record;
-	field->get_value = tid_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_tid_to_ctx);