Refactoring and fix: bytecode ABI

[lttng-ust.git] / liblttng-ust / lttng-probes.c

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index d009a87461108661f01dfca78021095f0eb4baed..00ce54cb36a9117338cecf4cc1bc3496f0b94227 100644 (file)
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -338,8 +338,8 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
                        }
 
                        for (j = 0; j < event_desc->nr_fields; j++) {
-                               const struct lttng_event_field *event_field =
-                                       &event_desc->fields[j];
+                               const struct lttng_ust_event_field *event_field =
+                                       event_desc->fields[j];
                                struct tp_field_list_entry *list_entry;
 
                                list_entry = zmalloc(sizeof(*list_entry));
@@ -354,31 +354,29 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
                                        event_field->name,
                                        LTTNG_UST_ABI_SYM_NAME_LEN);
                                list_entry->field.field_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
-                               switch (event_field->type.atype) {
-                               case atype_integer:
+                               switch (event_field->type->type) {
+                               case lttng_ust_type_integer:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_INTEGER;
                                        break;
-                               case atype_string:
+                               case lttng_ust_type_string:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING;
                                        break;
-                               case atype_array_nestable:
-                                       if (event_field->type.u.array_nestable.elem_type->atype != atype_integer
-                                               || event_field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none)
+                               case lttng_ust_type_array:
+                                       if (lttng_ust_get_type_array(event_field->type)->encoding == lttng_ust_string_encoding_none)
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER;
                                        else
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING;
                                        break;
-                               case atype_sequence_nestable:
-                                       if (event_field->type.u.sequence_nestable.elem_type->atype != atype_integer
-                                               || event_field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none)
+                               case lttng_ust_type_sequence:
+                                       if (lttng_ust_get_type_sequence(event_field->type)->encoding == lttng_ust_string_encoding_none)
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER;
                                        else
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING;
                                        break;
-                               case atype_float:
+                               case lttng_ust_type_float:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_FLOAT;
                                        break;
-                               case atype_enum_nestable:
+                               case lttng_ust_type_enum:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_ENUM;
                                        break;
                                default: