X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fresolve-field-path.c;h=4bc0c9c2665fb8e41091a25689be7010e3d2445d;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=c8cd67032eb4a5e77ce52d66fe10a1fca0553767;hpb=0aa006b7775f9578e37c0f006df795e903d25acc;p=babeltrace.git diff --git a/src/lib/trace-ir/resolve-field-path.c b/src/lib/trace-ir/resolve-field-path.c index c8cd6703..4bc0c9c2 100644 --- a/src/lib/trace-ir/resolve-field-path.c +++ b/src/lib/trace-ir/resolve-field-path.c @@ -27,6 +27,7 @@ #include "common/assert.h" #include #include +#include #include #include #include @@ -46,12 +47,7 @@ bool find_field_class_recursive(struct bt_field_class *fc, goto end; } - switch (fc->type) { - case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR: - { + if (bt_field_class_type_is(fc->type, BT_FIELD_CLASS_TYPE_OPTION)) { struct bt_field_class_option *opt_fc = (void *) fc; struct bt_field_path_item item = { .type = BT_FIELD_PATH_ITEM_TYPE_CURRENT_OPTION_CONTENT, @@ -66,13 +62,9 @@ bool find_field_class_recursive(struct bt_field_class *fc, } bt_field_path_remove_last_item(field_path); - break; - } - case BT_FIELD_CLASS_TYPE_STRUCTURE: - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - { + } else if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE || + bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; uint64_t i; @@ -94,12 +86,7 @@ bool find_field_class_recursive(struct bt_field_class *fc, bt_field_path_remove_last_item(field_path); } - - break; - } - case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - { + } else if (bt_field_class_type_is(fc->type, BT_FIELD_CLASS_TYPE_ARRAY)) { struct bt_field_class_array *array_fc = (void *) fc; struct bt_field_path_item item = { .type = BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT, @@ -114,10 +101,6 @@ bool find_field_class_recursive(struct bt_field_class *fc, } bt_field_path_remove_last_item(field_path); - break; - } - default: - break; } end: @@ -261,24 +244,16 @@ struct bt_field_class *borrow_child_field_class( { struct bt_field_class *child_fc = NULL; - switch (parent_fc->type) { - case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR: - { + if (bt_field_class_type_is(parent_fc->type, + BT_FIELD_CLASS_TYPE_OPTION)) { struct bt_field_class_option *opt_fc = (void *) parent_fc; BT_ASSERT(fp_item->type == BT_FIELD_PATH_ITEM_TYPE_CURRENT_OPTION_CONTENT); child_fc = opt_fc->content_fc; - break; - } - case BT_FIELD_CLASS_TYPE_STRUCTURE: - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - { + } else if (parent_fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE || + bt_field_class_type_is(parent_fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { struct bt_field_class_named_field_class_container *container_fc = (void *) parent_fc; struct bt_named_field_class *named_fc; @@ -286,20 +261,13 @@ struct bt_field_class *borrow_child_field_class( BT_ASSERT(fp_item->type == BT_FIELD_PATH_ITEM_TYPE_INDEX); named_fc = container_fc->named_fcs->pdata[fp_item->index]; child_fc = named_fc->fc; - break; - } - case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - { + } else if (bt_field_class_type_is(parent_fc->type, + BT_FIELD_CLASS_TYPE_ARRAY)) { struct bt_field_class_array *array_fc = (void *) parent_fc; BT_ASSERT(fp_item->type == BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT); child_fc = array_fc->element_fc; - break; - } - default: - break; } return child_fc; @@ -327,15 +295,12 @@ bool target_field_path_in_different_scope_has_struct_fc_only( bt_field_path_borrow_item_by_index_inline( tgt_field_path, i); - if (fc->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY || - fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY || - fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR || - fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR || - fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR || - fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR || - fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR || - fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR || - fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) { + if (bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_ARRAY) || + bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_OPTION) || + bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { is_valid = false; goto end; } @@ -450,15 +415,12 @@ bool lca_to_target_has_struct_fc_only(struct bt_field_path *src_field_path, bt_field_path_borrow_item_by_index_inline( tgt_field_path, tgt_i); - if (tgt_fc->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY || - tgt_fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY || - tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR || - tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR || - tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR || - tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR || - tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR || - tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR || - tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) { + if (bt_field_class_type_is(tgt_fc->type, + BT_FIELD_CLASS_TYPE_ARRAY) || + bt_field_class_type_is(tgt_fc->type, + BT_FIELD_CLASS_TYPE_OPTION) || + bt_field_class_type_is(tgt_fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { is_valid = false; goto end; } @@ -567,45 +529,32 @@ int bt_resolve_field_paths(struct bt_field_class *fc, BT_ASSERT(fc); /* Resolving part for dynamic array and variant field classes */ - switch (fc->type) { - case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR: - { - struct bt_field_class_option_with_selector *opt_fc = (void *) fc; - - if (opt_fc->selector_fc) { - BT_ASSERT(!opt_fc->selector_field_path); - opt_fc->selector_field_path = resolve_field_path( - fc, opt_fc->selector_fc, ctx); - if (!opt_fc->selector_field_path) { - ret = -1; - goto end; - } + if (bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_OPTION_WITH_SELECTOR_FIELD)) { + struct bt_field_class_option_with_selector_field *opt_fc = (void *) fc; + + BT_ASSERT(opt_fc->selector_fc); + BT_ASSERT(!opt_fc->selector_field_path); + opt_fc->selector_field_path = resolve_field_path( + fc, opt_fc->selector_fc, ctx); + if (!opt_fc->selector_field_path) { + ret = -1; + goto end; } - - break; - } - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - { + } else if (fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD) { struct bt_field_class_array_dynamic *dyn_array_fc = (void *) fc; - if (dyn_array_fc->length_fc) { - BT_ASSERT(!dyn_array_fc->length_field_path); - dyn_array_fc->length_field_path = resolve_field_path( - fc, dyn_array_fc->length_fc, ctx); - if (!dyn_array_fc->length_field_path) { - ret = -1; - goto end; - } + BT_ASSERT(dyn_array_fc->length_fc); + BT_ASSERT(!dyn_array_fc->length_field_path); + dyn_array_fc->length_field_path = resolve_field_path( + fc, dyn_array_fc->length_fc, ctx); + if (!dyn_array_fc->length_field_path) { + ret = -1; + goto end; } - - break; - } - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - { - struct bt_field_class_variant_with_selector *var_fc = + } else if (bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SELECTOR_FIELD)) { + struct bt_field_class_variant_with_selector_field *var_fc = (void *) fc; if (var_fc->selector_fc) { @@ -619,27 +568,15 @@ int bt_resolve_field_paths(struct bt_field_class *fc, } } } - default: - break; - } /* Recursive part */ - switch (fc->type) { - case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR: - case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR: - { + if (bt_field_class_type_is(fc->type, BT_FIELD_CLASS_TYPE_OPTION)) { struct bt_field_class_option *opt_fc = (void *) fc; ret = bt_resolve_field_paths(opt_fc->content_fc, ctx); - break; - } - case BT_FIELD_CLASS_TYPE_STRUCTURE: - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - { + } else if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE || + bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; uint64_t i; @@ -653,19 +590,11 @@ int bt_resolve_field_paths(struct bt_field_class *fc, goto end; } } - - break; - } - case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - { + } else if (bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_ARRAY)) { struct bt_field_class_array *array_fc = (void *) fc; ret = bt_resolve_field_paths(array_fc->element_fc, ctx); - break; - } - default: - break; } end: