X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vtid.c;h=57abdf733fc100287f7fb66b80ba63f83c92abee;hb=eae3c72949135b48639440468dc78ea1d5e937e9;hp=feb253d08b6d57c69f37d01be5cb2917345c1f0a;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index feb253d0..57abdf73 100644
--- a/liblttng-ust/lttng-context-vtid.c
+++ b/liblttng-ust/lttng-context-vtid.c
@@ -12,9 +12,11 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
-#include <lttng/ust-tid.h>
+#include <lttng/ringbuffer-context.h>
+#include <ust-tid.h>
 #include <urcu/tls-compat.h>
+
+#include "context-internal.h"
 #include "lttng-tracer-core.h"
 
 /*
@@ -34,7 +36,7 @@ void lttng_context_vtid_reset(void)
 }
 
 static
-size_t vtid_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t vtid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -57,9 +59,9 @@ pid_t wrapper_getvtid(void)
 }
 
 static
-void vtid_record(struct lttng_ctx_field *field,
+void vtid_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	pid_t vtid = wrapper_getvtid();
 
@@ -68,36 +70,51 @@ void vtid_record(struct lttng_ctx_field *field,
 }
 
 static
-void vtid_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void vtid_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = wrapper_getvtid();
 }
 
-int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_vtid_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	struct lttng_ust_ctx_field *field;
+	struct lttng_ust_type_common *type;
+	int ret;
 
-	field = lttng_append_context(ctx);
-	if (!field)
+	type = lttng_ust_create_type_integer(sizeof(pid_t) * CHAR_BIT,
+			lttng_alignof(pid_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(pid_t),
+			BYTE_ORDER, 10);
+	if (!type)
 		return -ENOMEM;
+	field = lttng_append_context(ctx);
+	if (!field) {
+		ret = -ENOMEM;
+		goto error_context;
+	}
 	if (lttng_find_context(*ctx, "vtid")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+		ret = -EEXIST;
+		goto error_find_context;
+	}
+	field->event_field->name = strdup("vtid");
+	if (!field->event_field->name) {
+		ret = -ENOMEM;
+		goto error_name;
 	}
-	field->event_field.name = "vtid";
-	field->event_field.type.atype = atype_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->event_field->type = type;
 	field->get_size = vtid_get_size;
 	field->record = vtid_record;
 	field->get_value = vtid_get_value;
 	lttng_context_update(*ctx);
 	return 0;
+
+error_name:
+error_find_context:
+	lttng_remove_context_field(ctx, field);
+error_context:
+	lttng_ust_destroy_type(type);
+	return ret;
 }
 
 /*