Refactoring: UST types public interfaces

[lttng-ust.git] / liblttng-ust / lttng-context-cpu-id.c

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index 1221bf6cf687db73f56256201eeff026b5b26f24..cdcfe1a1574fe473ab1a4dd0c64dcd622188cc74 100644 (file)
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -55,25 +55,40 @@ void cpu_id_get_value(struct lttng_ust_ctx_field *field,
 int lttng_add_cpu_id_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(int) * CHAR_BIT,
+                       lttng_alignof(int) * CHAR_BIT,
+                       lttng_is_signed_type(int),
+                       BYTE_ORDER, 10);
+       if (!type)
                return -ENOMEM;
+       field = lttng_append_context(ctx);
+       if (!field) {
+               ret = -ENOMEM;
+               goto error_context;
+       }
        if (lttng_find_context(*ctx, "cpu_id")) {
-               lttng_remove_context_field(ctx, field);
-               return -EEXIST;
+               ret = -EEXIST;
+               goto error_find_context;
        }
-       field->event_field->name = "cpu_id";
-       field->event_field->type.atype = atype_integer;
-       field->event_field->type.u.integer.size = sizeof(int) * CHAR_BIT;
-       field->event_field->type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-       field->event_field->type.u.integer.signedness = lttng_is_signed_type(int);
-       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("cpu_id");
+       if (!field->event_field->name) {
+               ret = -ENOMEM;
+               goto error_name;
+       }
+       field->event_field->type = type;
        field->get_size = cpu_id_get_size;
        field->record = cpu_id_record;
        field->get_value = cpu_id_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;
 }