X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Ffields.c;h=9872dd77603da350d8a42b23c89e05ed32949761;hb=864cad701843d041ae0c9113fc2c20f9b3e1835d;hp=376bc5d66c60d80ecbaa17738cd1122aa92a9121;hpb=5cd6d0e5fa67c2bdd21dc153313618260595d7bc;p=babeltrace.git diff --git a/lib/trace-ir/fields.c b/lib/trace-ir/fields.c index 376bc5d6..9872dd77 100644 --- a/lib/trace-ir/fields.c +++ b/lib/trace-ir/fields.c @@ -142,16 +142,16 @@ struct bt_field *create_variant_field(struct bt_field_class *); static struct bt_field *(* const field_create_funcs[])(struct bt_field_class *) = { - [BT_FIELD_CLASS_ID_UNSIGNED_INTEGER] = create_integer_field, - [BT_FIELD_CLASS_ID_SIGNED_INTEGER] = create_integer_field, - [BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION] = create_integer_field, - [BT_FIELD_CLASS_ID_SIGNED_ENUMERATION] = create_integer_field, - [BT_FIELD_CLASS_ID_REAL] = create_real_field, - [BT_FIELD_CLASS_ID_STRING] = create_string_field, - [BT_FIELD_CLASS_ID_STRUCTURE] = create_structure_field, - [BT_FIELD_CLASS_ID_STATIC_ARRAY] = create_static_array_field, - [BT_FIELD_CLASS_ID_DYNAMIC_ARRAY] = create_dynamic_array_field, - [BT_FIELD_CLASS_ID_VARIANT] = create_variant_field, + [BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER] = create_integer_field, + [BT_FIELD_CLASS_TYPE_SIGNED_INTEGER] = create_integer_field, + [BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION] = create_integer_field, + [BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION] = create_integer_field, + [BT_FIELD_CLASS_TYPE_REAL] = create_real_field, + [BT_FIELD_CLASS_TYPE_STRING] = create_string_field, + [BT_FIELD_CLASS_TYPE_STRUCTURE] = create_structure_field, + [BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = create_static_array_field, + [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY] = create_dynamic_array_field, + [BT_FIELD_CLASS_TYPE_VARIANT] = create_variant_field, }; static @@ -174,16 +174,16 @@ void destroy_variant_field(struct bt_field *field); static void (* const field_destroy_funcs[])(struct bt_field *) = { - [BT_FIELD_CLASS_ID_UNSIGNED_INTEGER] = destroy_integer_field, - [BT_FIELD_CLASS_ID_SIGNED_INTEGER] = destroy_integer_field, - [BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION] = destroy_integer_field, - [BT_FIELD_CLASS_ID_SIGNED_ENUMERATION] = destroy_integer_field, - [BT_FIELD_CLASS_ID_REAL] = destroy_real_field, - [BT_FIELD_CLASS_ID_STRING] = destroy_string_field, - [BT_FIELD_CLASS_ID_STRUCTURE] = destroy_structure_field, - [BT_FIELD_CLASS_ID_STATIC_ARRAY] = destroy_array_field, - [BT_FIELD_CLASS_ID_DYNAMIC_ARRAY] = destroy_array_field, - [BT_FIELD_CLASS_ID_VARIANT] = destroy_variant_field, + [BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER] = destroy_integer_field, + [BT_FIELD_CLASS_TYPE_SIGNED_INTEGER] = destroy_integer_field, + [BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION] = destroy_integer_field, + [BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION] = destroy_integer_field, + [BT_FIELD_CLASS_TYPE_REAL] = destroy_real_field, + [BT_FIELD_CLASS_TYPE_STRING] = destroy_string_field, + [BT_FIELD_CLASS_TYPE_STRUCTURE] = destroy_structure_field, + [BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = destroy_array_field, + [BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY] = destroy_array_field, + [BT_FIELD_CLASS_TYPE_VARIANT] = destroy_variant_field, }; struct bt_field_class *bt_field_borrow_class(struct bt_field *field) @@ -192,10 +192,10 @@ struct bt_field_class *bt_field_borrow_class(struct bt_field *field) return field->class; } -enum bt_field_class_id bt_field_get_class_id(struct bt_field *field) +enum bt_field_class_type bt_field_get_class_type(struct bt_field *field) { BT_ASSERT_PRE_NON_NULL(field, "Field"); - return field->class->id; + return field->class->type; } BT_HIDDEN @@ -204,8 +204,8 @@ struct bt_field *bt_field_create(struct bt_field_class *fc) struct bt_field *field = NULL; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); - BT_ASSERT(bt_field_class_has_known_id(fc)); - field = field_create_funcs[fc->id](fc); + BT_ASSERT(bt_field_class_has_known_type(fc)); + field = field_create_funcs[fc->type](fc); if (!field) { BT_LIB_LOGE("Cannot create field object from field classe: " "%![fc-]+F", fc); @@ -536,7 +536,7 @@ double bt_field_real_get_value(struct bt_field *field) BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_FIELD_IS_SET(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, BT_FIELD_CLASS_ID_REAL, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_REAL, "Field"); return real_field->value; } @@ -545,7 +545,7 @@ void bt_field_real_set_value(struct bt_field *field, double value) struct bt_field_real *real_field = (void *) field; BT_ASSERT_PRE_NON_NULL(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, BT_FIELD_CLASS_ID_REAL, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_REAL, "Field"); BT_ASSERT_PRE_FIELD_HOT(field, "Field"); BT_ASSERT_PRE( !((struct bt_field_class_real *) field->class)->is_single_precision || @@ -566,8 +566,8 @@ int bt_field_unsigned_enumeration_get_mapping_labels(struct bt_field *field, BT_ASSERT_PRE_NON_NULL(label_array, "Label array (output)"); BT_ASSERT_PRE_NON_NULL(label_array, "Count (output)"); BT_ASSERT_PRE_FIELD_IS_SET(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_UNSIGNED_ENUMERATION, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field"); return bt_field_class_unsigned_enumeration_get_mapping_labels_by_value( field->class, int_field->value.u, label_array, count); } @@ -582,8 +582,8 @@ int bt_field_signed_enumeration_get_mapping_labels(struct bt_field *field, BT_ASSERT_PRE_NON_NULL(label_array, "Label array (output)"); BT_ASSERT_PRE_NON_NULL(label_array, "Count (output)"); BT_ASSERT_PRE_FIELD_IS_SET(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_SIGNED_ENUMERATION, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field"); return bt_field_class_signed_enumeration_get_mapping_labels_by_value( field->class, int_field->value.i, label_array, count); } @@ -594,7 +594,7 @@ const char *bt_field_string_get_value(struct bt_field *field) BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_FIELD_IS_SET(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, BT_FIELD_CLASS_ID_STRING, + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING, "Field"); return (const char *) string_field->buf->data; } @@ -605,7 +605,7 @@ uint64_t bt_field_string_get_length(struct bt_field *field) BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_FIELD_IS_SET(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, BT_FIELD_CLASS_ID_STRING, + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING, "Field"); return string_field->length; } @@ -615,7 +615,7 @@ int bt_field_string_set_value(struct bt_field *field, const char *value) BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_NON_NULL(value, "Value"); BT_ASSERT_PRE_FIELD_HOT(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, BT_FIELD_CLASS_ID_STRING, + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING, "Field"); bt_field_string_clear(field); return bt_field_string_append_with_length(field, value, @@ -638,8 +638,8 @@ int bt_field_string_append_with_length(struct bt_field *field, BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_NON_NULL(value, "Value"); BT_ASSERT_PRE_FIELD_HOT(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_STRING, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_STRING, "Field"); /* Make sure no null bytes are appended */ BT_ASSERT_PRE(memchr(value, '\0', length) == NULL, @@ -666,8 +666,8 @@ int bt_field_string_clear(struct bt_field *field) BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_FIELD_HOT(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_STRING, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_STRING, "Field"); string_field->length = 0; bt_field_set_single(field, true); return 0; @@ -689,8 +689,8 @@ int bt_field_dynamic_array_set_length(struct bt_field *field, struct bt_field_array *array_field = (void *) field; BT_ASSERT_PRE_NON_NULL(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_DYNAMIC_ARRAY, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, "Field"); BT_ASSERT_PRE_FIELD_HOT(field, "Field"); if (unlikely(length > array_field->fields->len)) { @@ -743,8 +743,8 @@ struct bt_field *bt_field_structure_borrow_member_field_by_index( struct bt_field_structure *struct_field = (void *) field; BT_ASSERT_PRE_NON_NULL(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_STRUCTURE, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_STRUCTURE, "Field"); BT_ASSERT_PRE_VALID_INDEX(index, struct_field->fields->len); return struct_field->fields->pdata[index]; } @@ -760,8 +760,8 @@ struct bt_field *bt_field_structure_borrow_member_field_by_name( BT_ASSERT_PRE_NON_NULL(field, "Field"); BT_ASSERT_PRE_NON_NULL(name, "Field name"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_STRUCTURE, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_STRUCTURE, "Field"); struct_fc = (void *) field->class; if (!g_hash_table_lookup_extended(struct_fc->common.name_to_index, name, @@ -782,8 +782,8 @@ struct bt_field *bt_field_variant_borrow_selected_option_field( struct bt_field_variant *var_field = (void *) field; BT_ASSERT_PRE_NON_NULL(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_VARIANT, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_VARIANT, "Field"); BT_ASSERT_PRE(var_field->selected_field, "Variant field has no selected field: %!+f", field); return var_field->selected_field; @@ -795,8 +795,8 @@ int bt_field_variant_select_option_field(struct bt_field *field, struct bt_field_variant *var_field = (void *) field; BT_ASSERT_PRE_NON_NULL(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_VARIANT, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_VARIANT, "Field"); BT_ASSERT_PRE_FIELD_HOT(field, "Field"); BT_ASSERT_PRE_VALID_INDEX(index, var_field->fields->len); var_field->selected_field = var_field->fields->pdata[index]; @@ -810,8 +810,8 @@ uint64_t bt_field_variant_get_selected_option_field_index( struct bt_field_variant *var_field = (void *) field; BT_ASSERT_PRE_NON_NULL(field, "Field"); - BT_ASSERT_PRE_FIELD_HAS_CLASS_ID(field, - BT_FIELD_CLASS_ID_VARIANT, "Field"); + BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, + BT_FIELD_CLASS_TYPE_VARIANT, "Field"); BT_ASSERT_PRE(var_field->selected_field, "Variant field has no selected field: %!+f", field); return var_field->selected_index; @@ -911,8 +911,8 @@ BT_HIDDEN void bt_field_destroy(struct bt_field *field) { BT_ASSERT(field); - BT_ASSERT(bt_field_class_has_known_id(field->class)); - field_destroy_funcs[field->class->id](field); + BT_ASSERT(bt_field_class_has_known_type(field->class)); + field_destroy_funcs[field->class->type](field); } static