X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vtid.c;h=432b8b0dd16dcc4163acbee3794a973caf57b24b;hb=a084756d092167324ee09d3f819cc45407b58233;hp=9b91e57c5dd962b7991a03e81978ff0e409177a7;hpb=35c1f459092b630dd2825450014e27c84b31ddee;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index 9b91e57c..432b8b0d 100644
--- a/liblttng-ust/lttng-context-vtid.c
+++ b/liblttng-ust/lttng-context-vtid.c
@@ -79,27 +79,42 @@ void vtid_get_value(struct lttng_ust_ctx_field *field,
 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;
 
-	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_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 = "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->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);
 	return 0;
+
+error_name:
+error_find_context:
+	lttng_remove_context_field(ctx, field);
+error_context:
+	lttng_ust_destroy_type(type);
+	return ret;
 }
 
 /*