X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vuid.c;h=775f2cbf5f32f132eab22bc3e59c5b6e23c36e6b;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=e6f57e71ec747450be7c2efc8a6afd7dac3de57f;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vuid.c b/liblttng-ust/lttng-context-vuid.c
index e6f57e71..775f2cbf 100644
--- a/liblttng-ust/lttng-context-vuid.c
+++ b/liblttng-ust/lttng-context-vuid.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"
@@ -61,71 +62,59 @@ void lttng_context_vuid_reset(void)
 }
 
 static
-size_t vuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t vuid_get_size(void *priv __attribute__((unused)),
+		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_ust_rb_alignof(uid_t));
 	size += sizeof(uid_t);
 	return size;
 }
 
 static
-void vuid_record(struct lttng_ust_ctx_field *field,
+void vuid_record(void *priv __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	uid_t vuid;
 
 	vuid = get_vuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vuid));
-	chan->ops->event_write(ctx, &vuid, sizeof(vuid));
+	chan->ops->event_write(ctx, &vuid, sizeof(vuid), lttng_ust_rb_alignof(vuid));
 }
 
 static
-void vuid_get_value(struct lttng_ust_ctx_field *field,
+void vuid_get_value(void *priv __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_vuid();
 }
 
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+	lttng_ust_static_event_field("vuid",
+		lttng_ust_static_type_integer(sizeof(uid_t) * CHAR_BIT,
+				lttng_ust_rb_alignof(uid_t) * CHAR_BIT,
+				lttng_ust_is_signed_type(uid_t),
+				BYTE_ORDER, 10),
+		false, false),
+	vuid_get_size,
+	vuid_record,
+	vuid_get_value,
+	NULL, NULL);
+
 int lttng_add_vuid_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ust_ctx_field *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_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, "vuid")) {
+	if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
 		ret = -EEXIST;
 		goto error_find_context;
 	}
-	field->event_field->name = strdup("vuid");
-	if (!field->event_field->name) {
-		ret = -ENOMEM;
-		goto error_name;
-	}
-	field->event_field->type = type;
-	field->get_size = vuid_get_size;
-	field->record = vuid_record;
-	field->get_value = vuid_get_value;
-	lttng_context_update(*ctx);
+	ret = lttng_ust_context_append(ctx, ctx_field);
+	if (ret)
+		return ret;
 	return 0;
 
-error_name:
 error_find_context:
-	lttng_remove_context_field(ctx, field);
-error_context:
-	lttng_ust_destroy_type(type);
 	return ret;
 }