X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vsuid.c;h=8e08100857058ed8061aeb7ef150ffc5a362fc4a;hb=3b8bedd809f1a5b56da5fc101a90b44263b0f473;hp=0428292a3e277fc7993cab731f0bf7cb697ddc69;hpb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vsuid.c b/liblttng-ust/lttng-context-vsuid.c
index 0428292a..8e081008 100644
--- a/liblttng-ust/lttng-context-vsuid.c
+++ b/liblttng-ust/lttng-context-vsuid.c
@@ -8,13 +8,14 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "creds.h"
@@ -69,7 +70,7 @@ size_t vsuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(uid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_alignof(uid_t));
 	size += sizeof(uid_t);
 	return size;
 }
@@ -77,12 +78,12 @@ size_t vsuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void vsuid_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)
 {
 	uid_t vsuid;
 
 	vsuid = get_vsuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsuid));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsuid));
 	chan->ops->event_write(ctx, &vsuid, sizeof(vsuid));
 }
 
@@ -96,25 +97,40 @@ void vsuid_get_value(struct lttng_ust_ctx_field *field,
 int lttng_add_vsuid_to_ctx(struct lttng_ust_ctx **ctx)
 {
 	struct lttng_ust_ctx_field *field;
-
-	field = lttng_append_context(ctx);
-	if (!field)
+	struct lttng_ust_type_common *type;
+	int ret;
+
+	type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
+			lttng_alignof(uid_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(uid_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, "vsuid")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+		ret = -EEXIST;
+		goto error_find_context;
+	}
+	field->event_field->name = strdup("vsuid");
+	if (!field->event_field->name) {
+		ret = -ENOMEM;
+		goto error_name;
 	}
-	field->event_field->name = "vsuid";
-	field->event_field->type.atype = atype_integer;
-	field->event_field->type.u.integer.size = sizeof(uid_t) * CHAR_BIT;
-	field->event_field->type.u.integer.alignment = lttng_alignof(uid_t) * CHAR_BIT;
-	field->event_field->type.u.integer.signedness = lttng_is_signed_type(uid_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 = vsuid_get_size;
 	field->record = vsuid_record;
 	field->get_value = vsuid_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;
 }