X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vtid.c;h=3530d2668757269d6139369bbae19b0a14912c1f;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=1648d8db83f9c676ac90639f73429ab9717f9c9e;hpb=e7bc0ef6c86ae97886cf5f8b28854cf281d4962b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index 1648d8db..3530d266 100644
--- a/liblttng-ust/lttng-context-vtid.c
+++ b/liblttng-ust/lttng-context-vtid.c
@@ -7,6 +7,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -36,11 +37,12 @@ void lttng_context_vtid_reset(void)
 }
 
 static
-size_t vtid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t vtid_get_size(void *priv __attribute__((unused)),
+		size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(pid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(pid_t));
 	size += sizeof(pid_t);
 	return size;
 }
@@ -59,61 +61,48 @@ pid_t wrapper_getvtid(void)
 }
 
 static
-void vtid_record(struct lttng_ust_ctx_field *field,
+void vtid_record(void *priv __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_ust_channel_buffer *chan)
 {
 	pid_t vtid = wrapper_getvtid();
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vtid));
-	chan->ops->event_write(ctx, &vtid, sizeof(vtid));
+	chan->ops->event_write(ctx, &vtid, sizeof(vtid), lttng_ust_rb_alignof(vtid));
 }
 
 static
-void vtid_get_value(struct lttng_ust_ctx_field *field,
+void vtid_get_value(void *priv __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = wrapper_getvtid();
 }
 
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+	lttng_ust_static_event_field("vtid",
+		lttng_ust_static_type_integer(sizeof(pid_t) * CHAR_BIT,
+				lttng_ust_rb_alignof(pid_t) * CHAR_BIT,
+				lttng_ust_is_signed_type(pid_t),
+				BYTE_ORDER, 10),
+		false, false),
+	vtid_get_size,
+	vtid_record,
+	vtid_get_value,
+	NULL, NULL);
+
 int lttng_add_vtid_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(pid_t) * CHAR_BIT,
-			lttng_alignof(pid_t) * CHAR_BIT,
-			lttng_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")) {
+	if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
 		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->type = type;
-	field->get_size = vtid_get_size;
-	field->record = vtid_record;
-	field->get_value = vtid_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;
 }