X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=53d67d24c77ede0c217db3f4282b6a75764e4962;hp=7cc84953c1533f2ecab6604d953ebf9ab830a6a5;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=08c82b90d94a6dfee1f3da4ec06864c6045c07f7 diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c index 7cc84953..53d67d24 100644 --- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c +++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c @@ -14,6 +14,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -28,7 +36,7 @@ #include #include #include -#include +#include #include #include #include "ctf-scanner.h" @@ -50,7 +58,7 @@ struct last_enum_value { int opt_clock_force_correlate; static -struct declaration *ctf_type_specifier_list_visit(FILE *fd, +struct bt_declaration *ctf_type_specifier_list_visit(FILE *fd, int depth, struct ctf_node *type_specifier_list, struct declaration_scope *declaration_scope, struct ctf_trace *trace); @@ -87,10 +95,11 @@ char *concatenate_unary_strings(struct bt_list_head *head) bt_list_for_each_entry(node, head, siblings) { char *src_string; - assert(node->type == NODE_UNARY_EXPRESSION); - assert(node->u.unary_expression.type == UNARY_STRING); - assert((node->u.unary_expression.link == UNARY_LINK_UNKNOWN) - ^ (i != 0)); + if (node->type != NODE_UNARY_EXPRESSION + || node->u.unary_expression.type != UNARY_STRING + || !((node->u.unary_expression.link != UNARY_LINK_UNKNOWN) + ^ (i == 0))) + return NULL; switch (node->u.unary_expression.link) { case UNARY_DOTLINK: g_string_append(str, "."); @@ -121,10 +130,11 @@ GQuark get_map_clock_name_value(struct bt_list_head *head) bt_list_for_each_entry(node, head, siblings) { char *src_string; - assert(node->type == NODE_UNARY_EXPRESSION); - assert(node->u.unary_expression.type == UNARY_STRING); - assert((node->u.unary_expression.link == UNARY_LINK_UNKNOWN) - ^ (i != 0)); + if (node->type != NODE_UNARY_EXPRESSION + || node->u.unary_expression.type != UNARY_STRING + || !((node->u.unary_expression.link != UNARY_LINK_UNKNOWN) + ^ (i == 0))) + return 0; /* needs to be chained with . */ switch (node->u.unary_expression.link) { case UNARY_DOTLINK: @@ -176,10 +186,11 @@ int get_unary_unsigned(struct bt_list_head *head, uint64_t *value) int i = 0; bt_list_for_each_entry(node, head, siblings) { - assert(node->type == NODE_UNARY_EXPRESSION); - assert(node->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT); - assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN); - assert(i == 0); + if (node->type != NODE_UNARY_EXPRESSION + || node->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT + || node->u.unary_expression.link != UNARY_LINK_UNKNOWN + || i != 0) + return -EINVAL; *value = node->u.unary_expression.u.unsigned_constant; i++; } @@ -207,11 +218,11 @@ int get_unary_signed(struct bt_list_head *head, int64_t *value) int i = 0; bt_list_for_each_entry(node, head, siblings) { - assert(node->type == NODE_UNARY_EXPRESSION); - assert(node->u.unary_expression.type == UNARY_UNSIGNED_CONSTANT - || node->u.unary_expression.type == UNARY_SIGNED_CONSTANT); - assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN); - assert(i == 0); + if (node->type != NODE_UNARY_EXPRESSION + || (node->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT && node->u.unary_expression.type != UNARY_SIGNED_CONSTANT) + || node->u.unary_expression.link != UNARY_LINK_UNKNOWN + || i != 0) + return -EINVAL; switch (node->u.unary_expression.type) { case UNARY_UNSIGNED_CONSTANT: *value = (int64_t) node->u.unary_expression.u.unsigned_constant; @@ -220,7 +231,7 @@ int get_unary_signed(struct bt_list_head *head, int64_t *value) *value = node->u.unary_expression.u.signed_constant; break; default: - assert(0); + return -EINVAL; } i++; } @@ -237,12 +248,13 @@ int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid) bt_list_for_each_entry(node, head, siblings) { const char *src_string; - assert(node->type == NODE_UNARY_EXPRESSION); - assert(node->u.unary_expression.type == UNARY_STRING); - assert(node->u.unary_expression.link == UNARY_LINK_UNKNOWN); - assert(i == 0); + if (node->type != NODE_UNARY_EXPRESSION + || node->u.unary_expression.type != UNARY_STRING + || node->u.unary_expression.link != UNARY_LINK_UNKNOWN + || i != 0) + return -EINVAL; src_string = node->u.unary_expression.u.string; - ret = babeltrace_uuid_parse(src_string, uuid); + ret = bt_uuid_parse(src_string, uuid); } return ret; } @@ -255,16 +267,25 @@ struct ctf_stream_declaration *trace_stream_lookup(struct ctf_trace *trace, uint return g_ptr_array_index(trace->streams, stream_id); } +static +struct ctf_event_declaration *stream_event_lookup(struct ctf_stream_declaration *stream, uint64_t event_id) +{ + if (stream->events_by_id->len <= event_id) + return NULL; + return g_ptr_array_index(stream->events_by_id, event_id); +} + static struct ctf_clock *trace_clock_lookup(struct ctf_trace *trace, GQuark clock_name) { - return g_hash_table_lookup(trace->clocks, (gpointer) (unsigned long) clock_name); + return g_hash_table_lookup(trace->parent.clocks, (gpointer) (unsigned long) clock_name); } static int visit_type_specifier(FILE *fd, struct ctf_node *type_specifier, GString *str) { - assert(type_specifier->type == NODE_TYPE_SPECIFIER); + if (type_specifier->type != NODE_TYPE_SPECIFIER) + return -EINVAL; switch (type_specifier->u.type_specifier.type) { case TYPESPEC_VOID: @@ -403,12 +424,12 @@ GQuark create_typealias_identifier(FILE *fd, int depth, } static -struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, +struct bt_declaration *ctf_type_declarator_visit(FILE *fd, int depth, struct ctf_node *type_specifier_list, GQuark *field_name, struct ctf_node *node_type_declarator, struct declaration_scope *declaration_scope, - struct declaration *nested_declaration, + struct bt_declaration *nested_declaration, struct ctf_trace *trace) { /* @@ -418,7 +439,9 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, */ if (node_type_declarator) { - assert(node_type_declarator->u.type_declarator.type != TYPEDEC_UNKNOWN); + if (node_type_declarator->u.type_declarator.type == TYPEDEC_UNKNOWN) { + return NULL; + } /* TODO: gcc bitfields not supported yet. */ if (node_type_declarator->u.type_declarator.bitfield_len != NULL) { @@ -437,7 +460,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, */ alias_q = create_typealias_identifier(fd, depth, type_specifier_list, node_type_declarator); - nested_declaration = lookup_declaration(alias_q, declaration_scope); + nested_declaration = bt_lookup_declaration(alias_q, declaration_scope); if (!nested_declaration) { fprintf(fd, "[error] %s: cannot find typealias \"%s\".\n", __func__, g_quark_to_string(alias_q)); return NULL; @@ -452,7 +475,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, * integer declaration to modify it. There could be other references to * it. */ - integer_declaration = integer_declaration_new(integer_declaration->len, + integer_declaration = bt_integer_declaration_new(integer_declaration->len, integer_declaration->byte_order, integer_declaration->signedness, integer_declaration->p.alignment, 16, integer_declaration->encoding, integer_declaration->clock); @@ -475,7 +498,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, *field_name = 0; return nested_declaration; } else { - struct declaration *declaration; + struct bt_declaration *declaration; struct ctf_node *first; /* TYPEDEC_NESTED */ @@ -492,7 +515,9 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, } first = _bt_list_first_entry(&node_type_declarator->u.type_declarator.u.nested.length, struct ctf_node, siblings); - assert(first->type == NODE_UNARY_EXPRESSION); + if (first->type != NODE_UNARY_EXPRESSION) { + return NULL; + } switch (first->u.unary_expression.type) { case UNARY_UNSIGNED_CONSTANT: @@ -501,14 +526,14 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, size_t len; len = first->u.unary_expression.u.unsigned_constant; - array_declaration = array_declaration_new(len, nested_declaration, + array_declaration = bt_array_declaration_new(len, nested_declaration, declaration_scope); if (!array_declaration) { fprintf(fd, "[error] %s: cannot create array declaration.\n", __func__); return NULL; } - declaration_unref(nested_declaration); + bt_declaration_unref(nested_declaration); declaration = &array_declaration->p; break; } @@ -518,19 +543,21 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, char *length_name = concatenate_unary_strings(&node_type_declarator->u.type_declarator.u.nested.length); struct declaration_sequence *sequence_declaration; - sequence_declaration = sequence_declaration_new(length_name, nested_declaration, declaration_scope); + if (!length_name) + return NULL; + sequence_declaration = bt_sequence_declaration_new(length_name, nested_declaration, declaration_scope); if (!sequence_declaration) { fprintf(fd, "[error] %s: cannot create sequence declaration.\n", __func__); g_free(length_name); return NULL; } - declaration_unref(nested_declaration); + bt_declaration_unref(nested_declaration); declaration = &sequence_declaration->p; g_free(length_name); break; } default: - assert(0); + return NULL; } /* Pass it as content of outer container */ @@ -554,7 +581,7 @@ int ctf_struct_type_declarators_visit(FILE *fd, int depth, GQuark field_name; bt_list_for_each_entry(iter, type_declarators, siblings) { - struct declaration *field_declaration; + struct bt_declaration *field_declaration; field_declaration = ctf_type_declarator_visit(fd, depth, type_specifier_list, @@ -567,15 +594,15 @@ int ctf_struct_type_declarators_visit(FILE *fd, int depth, } /* Check if field with same name already exists */ - if (struct_declaration_lookup_field_index(struct_declaration, field_name) >= 0) { + if (bt_struct_declaration_lookup_field_index(struct_declaration, field_name) >= 0) { fprintf(fd, "[error] %s: duplicate field %s in struct\n", __func__, g_quark_to_string(field_name)); return -EINVAL; } - struct_declaration_add_field(struct_declaration, + bt_struct_declaration_add_field(struct_declaration, g_quark_to_string(field_name), field_declaration); - declaration_unref(field_declaration); + bt_declaration_unref(field_declaration); } return 0; } @@ -592,7 +619,7 @@ int ctf_variant_type_declarators_visit(FILE *fd, int depth, GQuark field_name; bt_list_for_each_entry(iter, type_declarators, siblings) { - struct declaration *field_declaration; + struct bt_declaration *field_declaration; field_declaration = ctf_type_declarator_visit(fd, depth, type_specifier_list, @@ -604,15 +631,15 @@ int ctf_variant_type_declarators_visit(FILE *fd, int depth, return -EINVAL; } - if (untagged_variant_declaration_get_field_from_tag(untagged_variant_declaration, field_name) != NULL) { + if (bt_untagged_variant_declaration_get_field_from_tag(untagged_variant_declaration, field_name) != NULL) { fprintf(fd, "[error] %s: duplicate field %s in variant\n", __func__, g_quark_to_string(field_name)); return -EINVAL; } - untagged_variant_declaration_add_field(untagged_variant_declaration, + bt_untagged_variant_declaration_add_field(untagged_variant_declaration, g_quark_to_string(field_name), field_declaration); - declaration_unref(field_declaration); + bt_declaration_unref(field_declaration); } return 0; } @@ -627,9 +654,9 @@ int ctf_typedef_visit(FILE *fd, int depth, struct declaration_scope *scope, GQuark identifier; bt_list_for_each_entry(iter, type_declarators, siblings) { - struct declaration *type_declaration; + struct bt_declaration *type_declaration; int ret; - + type_declaration = ctf_type_declarator_visit(fd, depth, type_specifier_list, &identifier, iter, @@ -644,15 +671,15 @@ int ctf_typedef_visit(FILE *fd, int depth, struct declaration_scope *scope, */ if (type_declaration->id == CTF_TYPE_UNTAGGED_VARIANT) { fprintf(fd, "[error] %s: typedef of untagged variant is not permitted.\n", __func__); - declaration_unref(type_declaration); + bt_declaration_unref(type_declaration); return -EPERM; } - ret = register_declaration(identifier, type_declaration, scope); + ret = bt_register_declaration(identifier, type_declaration, scope); if (ret) { type_declaration->declaration_free(type_declaration); return ret; } - declaration_unref(type_declaration); + bt_declaration_unref(type_declaration); } return 0; } @@ -662,7 +689,7 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope, struct ctf_node *target, struct ctf_node *alias, struct ctf_trace *trace) { - struct declaration *type_declaration; + struct bt_declaration *type_declaration; struct ctf_node *node; GQuark dummy_id; GQuark alias_q; @@ -694,7 +721,7 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope, */ if (type_declaration->id == CTF_TYPE_UNTAGGED_VARIANT) { fprintf(fd, "[error] %s: typedef of untagged variant is not permitted.\n", __func__); - declaration_unref(type_declaration); + bt_declaration_unref(type_declaration); return -EPERM; } /* @@ -714,10 +741,10 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope, struct ctf_node, siblings); alias_q = create_typealias_identifier(fd, depth, alias->u.typealias_alias.type_specifier_list, node); - err = register_declaration(alias_q, type_declaration, scope); + err = bt_register_declaration(alias_q, type_declaration, scope); if (err) goto error; - declaration_unref(type_declaration); + bt_declaration_unref(type_declaration); return 0; error: @@ -736,7 +763,7 @@ int ctf_struct_declaration_list_visit(FILE *fd, int depth, switch (iter->type) { case NODE_TYPEDEF: - /* For each declarator, declare type and add type to struct declaration scope */ + /* For each declarator, declare type and add type to struct bt_declaration scope */ ret = ctf_typedef_visit(fd, depth, struct_declaration->scope, iter->u._typedef.type_specifier_list, @@ -745,7 +772,7 @@ int ctf_struct_declaration_list_visit(FILE *fd, int depth, return ret; break; case NODE_TYPEALIAS: - /* Declare type with declarator and add type to struct declaration scope */ + /* Declare type with declarator and add type to struct bt_declaration scope */ ret = ctf_typealias_visit(fd, depth, struct_declaration->scope, iter->u.typealias.target, @@ -765,7 +792,7 @@ int ctf_struct_declaration_list_visit(FILE *fd, int depth, break; default: fprintf(fd, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type); - assert(0); + return -EINVAL; } return 0; } @@ -809,13 +836,13 @@ int ctf_variant_declaration_list_visit(FILE *fd, int depth, break; default: fprintf(fd, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type); - assert(0); + return -EINVAL; } return 0; } static -struct declaration *ctf_declaration_struct_visit(FILE *fd, +struct bt_declaration *ctf_declaration_struct_visit(FILE *fd, int depth, const char *name, struct bt_list_head *declaration_list, int has_body, struct bt_list_head *min_align, struct declaration_scope *declaration_scope, @@ -823,7 +850,6 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, { struct declaration_struct *struct_declaration; struct ctf_node *iter; - int ret; /* * For named struct (without body), lookup in @@ -831,11 +857,12 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, * declaration: ref is only taken upon definition. */ if (!has_body) { - assert(name); + if (!name) + return NULL; struct_declaration = - lookup_struct_declaration(g_quark_from_string(name), + bt_lookup_struct_declaration(g_quark_from_string(name), declaration_scope); - declaration_ref(&struct_declaration->p); + bt_declaration_ref(&struct_declaration->p); return &struct_declaration->p; } else { uint64_t min_align_value = 0; @@ -843,34 +870,39 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, /* For unnamed struct, create type */ /* For named struct (with body), create type and add to declaration scope */ if (name) { - if (lookup_struct_declaration(g_quark_from_string(name), + if (bt_lookup_struct_declaration(g_quark_from_string(name), declaration_scope)) { - fprintf(fd, "[error] %s: struct %s already declared in scope\n", __func__, name); return NULL; } } if (!bt_list_empty(min_align)) { + int ret; + ret = get_unary_unsigned(min_align, &min_align_value); if (ret) { fprintf(fd, "[error] %s: unexpected unary expression for structure \"align\" attribute\n", __func__); - ret = -EINVAL; goto error; } } - struct_declaration = struct_declaration_new(declaration_scope, + struct_declaration = bt_struct_declaration_new(declaration_scope, min_align_value); bt_list_for_each_entry(iter, declaration_list, siblings) { + int ret; + ret = ctf_struct_declaration_list_visit(fd, depth + 1, iter, struct_declaration, trace); if (ret) goto error_free_declaration; } if (name) { - ret = register_struct_declaration(g_quark_from_string(name), + int ret; + + ret = bt_register_struct_declaration(g_quark_from_string(name), struct_declaration, declaration_scope); - assert(!ret); + if (ret) + return NULL; } return &struct_declaration->p; } @@ -881,7 +913,7 @@ error: } static -struct declaration *ctf_declaration_variant_visit(FILE *fd, +struct bt_declaration *ctf_declaration_variant_visit(FILE *fd, int depth, const char *name, const char *choice, struct bt_list_head *declaration_list, int has_body, struct declaration_scope *declaration_scope, @@ -897,23 +929,23 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd, * declaration: ref is only taken upon definition. */ if (!has_body) { - assert(name); + if (!name) + return NULL; untagged_variant_declaration = - lookup_variant_declaration(g_quark_from_string(name), + bt_lookup_variant_declaration(g_quark_from_string(name), declaration_scope); - declaration_ref(&untagged_variant_declaration->p); + bt_declaration_ref(&untagged_variant_declaration->p); } else { /* For unnamed variant, create type */ /* For named variant (with body), create type and add to declaration scope */ if (name) { - if (lookup_variant_declaration(g_quark_from_string(name), + if (bt_lookup_variant_declaration(g_quark_from_string(name), declaration_scope)) { - fprintf(fd, "[error] %s: variant %s already declared in scope\n", __func__, name); return NULL; } } - untagged_variant_declaration = untagged_variant_declaration_new(declaration_scope); + untagged_variant_declaration = bt_untagged_bt_variant_declaration_new(declaration_scope); bt_list_for_each_entry(iter, declaration_list, siblings) { int ret; @@ -925,10 +957,11 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd, if (name) { int ret; - ret = register_variant_declaration(g_quark_from_string(name), + ret = bt_register_variant_declaration(g_quark_from_string(name), untagged_variant_declaration, declaration_scope); - assert(!ret); + if (ret) + return NULL; } } /* @@ -938,10 +971,10 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd, if (!choice) { return &untagged_variant_declaration->p; } else { - variant_declaration = variant_declaration_new(untagged_variant_declaration, choice); + variant_declaration = bt_variant_declaration_new(untagged_variant_declaration, choice); if (!variant_declaration) goto error; - declaration_unref(&untagged_variant_declaration->p); + bt_declaration_unref(&untagged_variant_declaration->p); return &variant_declaration->p; } error: @@ -960,13 +993,14 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, q = g_quark_from_string(enumerator->u.enumerator.id); if (enum_declaration->integer_declaration->signedness) { - int64_t start, end; + int64_t start = 0, end = 0; int nr_vals = 0; bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) { int64_t *target; - assert(iter->type == NODE_UNARY_EXPRESSION); + if (iter->type != NODE_UNARY_EXPRESSION) + return -EINVAL; if (nr_vals == 0) target = &start; else @@ -994,15 +1028,16 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, if (nr_vals <= 1) end = start; last->u.s = end + 1; - enum_signed_insert(enum_declaration, start, end, q); + bt_enum_signed_insert(enum_declaration, start, end, q); } else { - uint64_t start, end; + uint64_t start = 0, end = 0; int nr_vals = 0; bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) { uint64_t *target; - assert(iter->type == NODE_UNARY_EXPRESSION); + if (iter->type != NODE_UNARY_EXPRESSION) + return -EINVAL; if (nr_vals == 0) target = &start; else @@ -1034,13 +1069,13 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, if (nr_vals <= 1) end = start; last->u.u = end + 1; - enum_unsigned_insert(enum_declaration, start, end, q); + bt_enum_unsigned_insert(enum_declaration, start, end, q); } return 0; } static -struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, +struct bt_declaration *ctf_declaration_enum_visit(FILE *fd, int depth, const char *name, struct ctf_node *container_type, struct bt_list_head *enumerator_list, @@ -1048,7 +1083,7 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, struct declaration_scope *declaration_scope, struct ctf_trace *trace) { - struct declaration *declaration; + struct bt_declaration *declaration; struct declaration_enum *enum_declaration; struct declaration_integer *integer_declaration; struct last_enum_value last_value; @@ -1061,25 +1096,25 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, * declaration: ref is only taken upon definition. */ if (!has_body) { - assert(name); + if (!name) + return NULL; enum_declaration = - lookup_enum_declaration(g_quark_from_string(name), + bt_lookup_enum_declaration(g_quark_from_string(name), declaration_scope); - declaration_ref(&enum_declaration->p); + bt_declaration_ref(&enum_declaration->p); return &enum_declaration->p; } else { /* For unnamed enum, create type */ /* For named enum (with body), create type and add to declaration scope */ if (name) { - if (lookup_enum_declaration(g_quark_from_string(name), + if (bt_lookup_enum_declaration(g_quark_from_string(name), declaration_scope)) { - fprintf(fd, "[error] %s: enum %s already declared in scope\n", __func__, name); return NULL; } } if (!container_type) { - declaration = lookup_declaration(g_quark_from_static_string("int"), + declaration = bt_lookup_declaration(g_quark_from_static_string("int"), declaration_scope); if (!declaration) { fprintf(fd, "[error] %s: \"int\" type declaration missing for enumeration\n", __func__); @@ -1101,8 +1136,8 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, return NULL; } integer_declaration = container_of(declaration, struct declaration_integer, p); - enum_declaration = enum_declaration_new(integer_declaration); - declaration_unref(&integer_declaration->p); /* leave ref to enum */ + enum_declaration = bt_enum_declaration_new(integer_declaration); + bt_declaration_unref(&integer_declaration->p); /* leave ref to enum */ if (enum_declaration->integer_declaration->signedness) { last_value.u.s = 0; } else { @@ -1119,11 +1154,12 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, if (name) { int ret; - ret = register_enum_declaration(g_quark_from_string(name), + ret = bt_register_enum_declaration(g_quark_from_string(name), enum_declaration, declaration_scope); - assert(!ret); - declaration_unref(&enum_declaration->p); + if (ret) + return NULL; + bt_declaration_unref(&enum_declaration->p); } return &enum_declaration->p; } @@ -1133,25 +1169,29 @@ error: } static -struct declaration *ctf_declaration_type_specifier_visit(FILE *fd, int depth, +struct bt_declaration *ctf_declaration_type_specifier_visit(FILE *fd, int depth, struct ctf_node *type_specifier_list, struct declaration_scope *declaration_scope) { GString *str; - struct declaration *declaration; + struct bt_declaration *declaration; char *str_c; int ret; GQuark id_q; str = g_string_new(""); ret = visit_type_specifier_list(fd, type_specifier_list, str); - if (ret) + if (ret) { + (void) g_string_free(str, TRUE); return NULL; + } str_c = g_string_free(str, FALSE); id_q = g_quark_from_string(str_c); g_free(str_c); - declaration = lookup_declaration(id_q, declaration_scope); - declaration_ref(declaration); + declaration = bt_lookup_declaration(id_q, declaration_scope); + if (!declaration) + return NULL; + bt_declaration_ref(declaration); return declaration; } @@ -1196,7 +1236,7 @@ int get_boolean(FILE *fd, int depth, struct ctf_node *unary_expression) fprintf(fd, "[error] %s: unexpected unary expression type\n", __func__); return -EINVAL; - } + } } @@ -1215,7 +1255,7 @@ int get_trace_byte_order(FILE *fd, int depth, struct ctf_node *unary_expression) else if (!strcmp(unary_expression->u.unary_expression.u.string, "le")) byte_order = LITTLE_ENDIAN; else { - fprintf(fd, "[error] %s: unexpected string \"%s\". Should be \"native\", \"network\", \"be\" or \"le\".\n", + fprintf(fd, "[error] %s: unexpected string \"%s\". Should be \"be\" or \"le\".\n", __func__, unary_expression->u.unary_expression.u.string); return -EINVAL; } @@ -1250,7 +1290,7 @@ int get_byte_order(FILE *fd, int depth, struct ctf_node *unary_expression, } static -struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, +struct bt_declaration *ctf_declaration_integer_visit(FILE *fd, int depth, struct bt_list_head *expressions, struct ctf_trace *trace) { @@ -1269,7 +1309,8 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, left = _bt_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); right = _bt_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); - assert(left->u.unary_expression.type == UNARY_STRING); + if (left->u.unary_expression.type != UNARY_STRING) + return NULL; if (!strcmp(left->u.unary_expression.u.string, "signed")) { signedness = get_boolean(fd, depth, right); if (signedness < 0) @@ -1285,6 +1326,11 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, return NULL; } size = right->u.unary_expression.u.unsigned_constant; + if (!size) { + fprintf(fd, "[error] %s: integer size: expecting non-zero constant\n", + __func__); + return NULL; + } has_size = 1; } else if (!strcmp(left->u.unary_expression.u.string, "align")) { if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) { @@ -1429,21 +1475,21 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth, alignment = CHAR_BIT; } } - integer_declaration = integer_declaration_new(size, + integer_declaration = bt_integer_declaration_new(size, byte_order, signedness, alignment, base, encoding, clock); return &integer_declaration->p; } static -struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, +struct bt_declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, struct bt_list_head *expressions, struct ctf_trace *trace) { struct ctf_node *expression; - uint64_t alignment = 1, exp_dig = 0, mant_dig = 0, - byte_order = trace->byte_order; - int has_alignment = 0, has_exp_dig = 0, has_mant_dig = 0; + uint64_t alignment = 1, exp_dig = 0, mant_dig = 0; + int byte_order = trace->byte_order, has_alignment = 0, + has_exp_dig = 0, has_mant_dig = 0; struct declaration_float *float_declaration; bt_list_for_each_entry(expression, expressions, siblings) { @@ -1451,7 +1497,8 @@ struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, left = _bt_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); right = _bt_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); - assert(left->u.unary_expression.type == UNARY_STRING); + if (left->u.unary_expression.type != UNARY_STRING) + return NULL; if (!strcmp(left->u.unary_expression.u.string, "byte_order")) { byte_order = get_byte_order(fd, depth, right, trace); if (byte_order < 0) @@ -1509,13 +1556,13 @@ struct declaration *ctf_declaration_floating_point_visit(FILE *fd, int depth, alignment = CHAR_BIT; } } - float_declaration = float_declaration_new(mant_dig, exp_dig, + float_declaration = bt_float_declaration_new(mant_dig, exp_dig, byte_order, alignment); return &float_declaration->p; } static -struct declaration *ctf_declaration_string_visit(FILE *fd, int depth, +struct bt_declaration *ctf_declaration_string_visit(FILE *fd, int depth, struct bt_list_head *expressions, struct ctf_trace *trace) { @@ -1529,7 +1576,8 @@ struct declaration *ctf_declaration_string_visit(FILE *fd, int depth, left = _bt_list_first_entry(&expression->u.ctf_expression.left, struct ctf_node, siblings); right = _bt_list_first_entry(&expression->u.ctf_expression.right, struct ctf_node, siblings); - assert(left->u.unary_expression.type == UNARY_STRING); + if (left->u.unary_expression.type != UNARY_STRING) + return NULL; if (!strcmp(left->u.unary_expression.u.string, "encoding")) { if (right->u.unary_expression.type != UNARY_STRING) { fprintf(fd, "[error] %s: encoding: expecting string\n", @@ -1545,13 +1593,13 @@ struct declaration *ctf_declaration_string_visit(FILE *fd, int depth, } if (encoding_c && !strcmp(encoding_c, "ASCII")) encoding = CTF_STRING_ASCII; - string_declaration = string_declaration_new(encoding); + string_declaration = bt_string_declaration_new(encoding); return &string_declaration->p; } static -struct declaration *ctf_type_specifier_list_visit(FILE *fd, +struct bt_declaration *ctf_type_specifier_list_visit(FILE *fd, int depth, struct ctf_node *type_specifier_list, struct declaration_scope *declaration_scope, struct ctf_trace *trace) @@ -1559,11 +1607,13 @@ struct declaration *ctf_type_specifier_list_visit(FILE *fd, struct ctf_node *first; struct ctf_node *node; - assert(type_specifier_list->type == NODE_TYPE_SPECIFIER_LIST); + if (type_specifier_list->type != NODE_TYPE_SPECIFIER_LIST) + return NULL; first = _bt_list_first_entry(&type_specifier_list->u.type_specifier_list.head, struct ctf_node, siblings); - assert(first->type == NODE_TYPE_SPECIFIER); + if (first->type != NODE_TYPE_SPECIFIER) + return NULL; node = first->u.type_specifier.node; @@ -1652,6 +1702,8 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru char *left; left = concatenate_unary_strings(&node->u.ctf_expression.left); + if (!left) + return -EINVAL; if (!strcmp(left, "name")) { char *right; @@ -1702,7 +1754,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru } CTF_EVENT_SET_FIELD(event, stream_id); } else if (!strcmp(left, "context")) { - struct declaration *declaration; + struct bt_declaration *declaration; if (event->context_decl) { fprintf(fd, "[error] %s: context already declared in event declaration\n", __func__); @@ -1723,7 +1775,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru } event->context_decl = container_of(declaration, struct declaration_struct, p); } else if (!strcmp(left, "fields")) { - struct declaration *declaration; + struct bt_declaration *declaration; if (event->fields_decl) { fprintf(fd, "[error] %s: fields already declared in event declaration\n", __func__); @@ -1801,9 +1853,13 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event_declaration *event; struct bt_ctf_event_decl *event_decl; + if (node->visited) + return 0; + node->visited = 1; + event_decl = g_new0(struct bt_ctf_event_decl, 1); event = &event_decl->parent; - event->declaration_scope = new_declaration_scope(parent_declaration_scope); + event->declaration_scope = bt_new_declaration_scope(parent_declaration_scope); event->loglevel = -1; bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) { ret = ctf_event_declaration_visit(fd, depth + 1, iter, event, trace); @@ -1840,6 +1896,13 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node, fprintf(fd, "[error] %s: missing id field in event declaration\n", __func__); goto error; } + /* Disallow re-using the same event ID in the same stream */ + if (stream_event_lookup(event->stream, event->id)) { + ret = -EPERM; + fprintf(fd, "[error] %s: event ID %" PRIu64 " used more than once in stream %" PRIu64 "\n", + __func__, event->id, event->stream_id); + goto error; + } if (event->stream->events_by_id->len <= event->id) g_ptr_array_set_size(event->stream->events_by_id, event->id + 1); g_ptr_array_index(event->stream->events_by_id, event->id) = event; @@ -1851,10 +1914,10 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node, error: if (event->fields_decl) - declaration_unref(&event->fields_decl->p); + bt_declaration_unref(&event->fields_decl->p); if (event->context_decl) - declaration_unref(&event->context_decl->p); - free_declaration_scope(event->declaration_scope); + bt_declaration_unref(&event->context_decl->p); + bt_free_declaration_scope(event->declaration_scope); g_free(event_decl); return ret; } @@ -1888,6 +1951,8 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str char *left; left = concatenate_unary_strings(&node->u.ctf_expression.left); + if (!left) + return -EINVAL; if (!strcmp(left, "id")) { if (CTF_STREAM_FIELD_IS_SET(stream, stream_id)) { fprintf(fd, "[error] %s: id already declared in stream declaration\n", __func__); @@ -1902,7 +1967,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str } CTF_STREAM_SET_FIELD(stream, stream_id); } else if (!strcmp(left, "event.header")) { - struct declaration *declaration; + struct bt_declaration *declaration; if (stream->event_header_decl) { fprintf(fd, "[error] %s: event.header already declared in stream declaration\n", __func__); @@ -1923,7 +1988,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str } stream->event_header_decl = container_of(declaration, struct declaration_struct, p); } else if (!strcmp(left, "event.context")) { - struct declaration *declaration; + struct bt_declaration *declaration; if (stream->event_context_decl) { fprintf(fd, "[error] %s: event.context already declared in stream declaration\n", __func__); @@ -1944,7 +2009,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str } stream->event_context_decl = container_of(declaration, struct declaration_struct, p); } else if (!strcmp(left, "packet.context")) { - struct declaration *declaration; + struct bt_declaration *declaration; if (stream->packet_context_decl) { fprintf(fd, "[error] %s: packet.context already declared in stream declaration\n", __func__); @@ -1989,8 +2054,14 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_node *iter; struct ctf_stream_declaration *stream; + if (node) { + if (node->visited) + return 0; + node->visited = 1; + } + stream = g_new0(struct ctf_stream_declaration, 1); - stream->declaration_scope = new_declaration_scope(parent_declaration_scope); + stream->declaration_scope = bt_new_declaration_scope(parent_declaration_scope); stream->events_by_id = g_ptr_array_new(); stream->event_quark_to_id = g_hash_table_new(g_direct_hash, g_direct_equal); stream->streams = g_ptr_array_new(); @@ -2004,7 +2075,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node, if (CTF_STREAM_FIELD_IS_SET(stream, stream_id)) { /* check that packet header has stream_id field. */ if (!trace->packet_header_decl - || struct_declaration_lookup_field_index(trace->packet_header_decl, g_quark_from_static_string("stream_id")) < 0) { + || bt_struct_declaration_lookup_field_index(trace->packet_header_decl, g_quark_from_static_string("stream_id")) < 0) { ret = -EPERM; fprintf(fd, "[error] %s: missing stream_id field in packet header declaration, but stream_id attribute is declared for stream.\n", __func__); goto error; @@ -2027,15 +2098,15 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node, error: if (stream->event_header_decl) - declaration_unref(&stream->event_header_decl->p); + bt_declaration_unref(&stream->event_header_decl->p); if (stream->event_context_decl) - declaration_unref(&stream->event_context_decl->p); + bt_declaration_unref(&stream->event_context_decl->p); if (stream->packet_context_decl) - declaration_unref(&stream->packet_context_decl->p); + bt_declaration_unref(&stream->packet_context_decl->p); g_ptr_array_free(stream->streams, TRUE); g_ptr_array_free(stream->events_by_id, TRUE); g_hash_table_destroy(stream->event_quark_to_id); - free_declaration_scope(stream->declaration_scope); + bt_free_declaration_scope(stream->declaration_scope); g_free(stream); return ret; } @@ -2068,6 +2139,8 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru char *left; left = concatenate_unary_strings(&node->u.ctf_expression.left); + if (!left) + return -EINVAL; if (!strcmp(left, "major")) { if (CTF_TRACE_FIELD_IS_SET(trace, major)) { fprintf(fd, "[error] %s: major already declared in trace declaration\n", __func__); @@ -2104,7 +2177,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru goto error; } if (CTF_TRACE_FIELD_IS_SET(trace, uuid) - && babeltrace_uuid_compare(uuid, trace->uuid)) { + && bt_uuid_compare(uuid, trace->uuid)) { fprintf(fd, "[error] %s: uuid mismatch\n", __func__); ret = -EPERM; goto error; @@ -2118,8 +2191,10 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru right = _bt_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings); byte_order = get_trace_byte_order(fd, depth, right); - if (byte_order < 0) - return -EINVAL; + if (byte_order < 0) { + ret = -EINVAL; + goto error; + } if (CTF_TRACE_FIELD_IS_SET(trace, byte_order) && byte_order != trace->byte_order) { @@ -2142,7 +2217,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru } CTF_TRACE_SET_FIELD(trace, byte_order); } else if (!strcmp(left, "packet.header")) { - struct declaration *declaration; + struct bt_declaration *declaration; if (trace->packet_header_decl) { fprintf(fd, "[error] %s: packet.header already declared in trace declaration\n", __func__); @@ -2184,9 +2259,14 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace int ret = 0; struct ctf_node *iter; + if (!trace->restart_root_decl && node->visited) + return 0; + node->visited = 1; + if (trace->declaration_scope) return -EEXIST; - trace->declaration_scope = new_declaration_scope(trace->root_declaration_scope); + + trace->declaration_scope = bt_new_declaration_scope(trace->root_declaration_scope); trace->streams = g_ptr_array_new(); trace->event_declarations = g_ptr_array_new(); bt_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) { @@ -2213,7 +2293,7 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace if (!CTF_TRACE_FIELD_IS_SET(trace, byte_order)) { /* check that the packet header contains a "magic" field */ if (!trace->packet_header_decl - || struct_declaration_lookup_field_index(trace->packet_header_decl, g_quark_from_static_string("magic")) < 0) { + || bt_struct_declaration_lookup_field_index(trace->packet_header_decl, g_quark_from_static_string("magic")) < 0) { ret = -EPERM; fprintf(fd, "[error] %s: missing both byte_order and packet header magic number in trace declaration\n", __func__); goto error; @@ -2223,12 +2303,12 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace error: if (trace->packet_header_decl) { - declaration_unref(&trace->packet_header_decl->p); + bt_declaration_unref(&trace->packet_header_decl->p); trace->packet_header_decl = NULL; } g_ptr_array_free(trace->streams, TRUE); g_ptr_array_free(trace->event_declarations, TRUE); - free_declaration_scope(trace->declaration_scope); + bt_free_declaration_scope(trace->declaration_scope); trace->declaration_scope = NULL; return ret; } @@ -2245,6 +2325,8 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node, char *left; left = concatenate_unary_strings(&node->u.ctf_expression.left); + if (!left) + return -EINVAL; if (!strcmp(left, "name")) { char *right; @@ -2322,7 +2404,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node, ret = -EPERM; goto error; } - ret = get_unary_unsigned(&node->u.ctf_expression.right, &clock->offset_s); + ret = get_unary_signed(&node->u.ctf_expression.right, &clock->offset_s); if (ret) { fprintf(fd, "[error] %s: unexpected unary expression for clock offset_s\n", __func__); ret = -EINVAL; @@ -2334,7 +2416,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node, ret = -EPERM; goto error; } - ret = get_unary_unsigned(&node->u.ctf_expression.right, &clock->offset); + ret = get_unary_signed(&node->u.ctf_expression.right, &clock->offset); if (ret) { fprintf(fd, "[error] %s: unexpected unary expression for clock offset\n", __func__); ret = -EINVAL; @@ -2351,6 +2433,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node, goto error; } clock->absolute = ret; + ret = 0; } else { fprintf(fd, "[warning] %s: attribute \"%s\" is unknown in clock declaration.\n", __func__, left); } @@ -2374,6 +2457,10 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace struct ctf_node *iter; struct ctf_clock *clock; + if (node->visited) + return 0; + node->visited = 1; + clock = g_new0(struct ctf_clock, 1); /* Default clock frequency is set to 1000000000 */ clock->freq = 1000000000ULL; @@ -2385,7 +2472,7 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace if (opt_clock_force_correlate) { /* * User requested to forcibly correlate the clock - * sources, even if we have no correlatation + * sources, even if we have no correlation * information. */ if (!clock->absolute) { @@ -2398,13 +2485,13 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace fprintf(fd, "[error] %s: missing name field in clock declaration\n", __func__); goto error; } - if (g_hash_table_size(trace->clocks) > 0) { + if (g_hash_table_size(trace->parent.clocks) > 0) { fprintf(fd, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n"); ret = -EINVAL; goto error; } - trace->single_clock = clock; - g_hash_table_insert(trace->clocks, (gpointer) (unsigned long) clock->name, clock); + trace->parent.single_clock = clock; + g_hash_table_insert(trace->parent.clocks, (gpointer) (unsigned long) clock->name, clock); return 0; error: @@ -2438,8 +2525,8 @@ void ctf_clock_default(FILE *fd, int depth, struct ctf_trace *trace) clock->absolute = 0; /* Not an absolute reference across traces */ } - trace->single_clock = clock; - g_hash_table_insert(trace->clocks, (gpointer) (unsigned long) clock->name, clock); + trace->parent.single_clock = clock; + g_hash_table_insert(trace->parent.clocks, (gpointer) (unsigned long) clock->name, clock); } static @@ -2463,6 +2550,8 @@ int ctf_callsite_declaration_visit(FILE *fd, int depth, struct ctf_node *node, char *left; left = concatenate_unary_strings(&node->u.ctf_expression.left); + if (!left) + return -EINVAL; if (!strcmp(left, "name")) { char *right; @@ -2562,6 +2651,10 @@ int ctf_callsite_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_tr struct ctf_callsite *callsite; struct ctf_callsite_dups *cs_dups; + if (node->visited) + return 0; + node->visited = 1; + callsite = g_new0(struct ctf_callsite, 1); bt_list_for_each_entry(iter, &node->u.callsite.declaration_list, siblings) { ret = ctf_callsite_declaration_visit(fd, depth + 1, iter, callsite, trace); @@ -2634,6 +2727,8 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, char *left; left = concatenate_unary_strings(&node->u.ctf_expression.left); + if (!left) + return -EINVAL; if (!strcmp(left, "vpid")) { uint64_t v; @@ -2749,6 +2844,11 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, char *right; right = concatenate_unary_strings(&node->u.ctf_expression.right); + if (!right) { + fprintf(fd, "[warning] %s: unexpected unary expression for env\n", __func__); + ret = -EINVAL; + goto error; + } printf_verbose("env.%s = \"%s\"\n", left, right); g_free(right); } else if (is_unary_unsigned(&node->u.ctf_expression.right)) { @@ -2756,14 +2856,16 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node, int ret; ret = get_unary_unsigned(&node->u.ctf_expression.right, &v); - assert(ret == 0); + if (ret) + goto error; printf_verbose("env.%s = %" PRIu64 "\n", left, v); } else if (is_unary_signed(&node->u.ctf_expression.right)) { int64_t v; int ret; ret = get_unary_signed(&node->u.ctf_expression.right, &v); - assert(ret == 0); + if (ret) + goto error; printf_verbose("env.%s = %" PRId64 "\n", left, v); } else { printf_verbose("%s: attribute \"%s\" has unknown type.\n", __func__, left); @@ -2787,6 +2889,10 @@ int ctf_env_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace * int ret = 0; struct ctf_node *iter; + if (node->visited) + return 0; + node->visited = 1; + trace->env.vpid = -1; trace->env.procname[0] = '\0'; trace->env.hostname[0] = '\0'; @@ -2808,6 +2914,10 @@ int ctf_root_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struc { int ret = 0; + if (!trace->restart_root_decl && node->visited) + return 0; + node->visited = 1; + switch (node->type) { case NODE_TYPEDEF: ret = ctf_typedef_visit(fd, depth + 1, @@ -2828,7 +2938,7 @@ int ctf_root_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struc break; case NODE_TYPE_SPECIFIER_LIST: { - struct declaration *declaration; + struct bt_declaration *declaration; /* * Just add the type specifier to the root scope @@ -2838,7 +2948,7 @@ int ctf_root_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struc node, trace->root_declaration_scope, trace); if (!declaration) return -ENOMEM; - declaration_unref(declaration); + bt_declaration_unref(declaration); break; } default: @@ -2853,38 +2963,34 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node, { int ret = 0; struct ctf_node *iter; - int env_clock_done = 0; - printf_verbose("CTF visitor: metadata construction... "); + printf_verbose("CTF visitor: metadata construction...\n"); trace->byte_order = byte_order; - trace->clocks = g_hash_table_new_full(g_direct_hash, g_direct_equal, - NULL, clock_free); + trace->parent.clocks = g_hash_table_new_full(g_direct_hash, + g_direct_equal, NULL, clock_free); trace->callsites = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, callsite_free); retry: - trace->root_declaration_scope = new_declaration_scope(NULL); + trace->root_declaration_scope = bt_new_declaration_scope(NULL); switch (node->type) { case NODE_ROOT: - if (!env_clock_done) { - /* - * declarations need to query clock hash table, - * so clock need to be treated first. - */ - if (bt_list_empty(&node->u.root.clock)) { - ctf_clock_default(fd, depth + 1, trace); - } else { - bt_list_for_each_entry(iter, &node->u.root.clock, siblings) { - ret = ctf_clock_visit(fd, depth + 1, iter, - trace); - if (ret) { - fprintf(fd, "[error] %s: clock declaration error\n", __func__); - goto error; - } + /* + * declarations need to query clock hash table, + * so clock need to be treated first. + */ + if (bt_list_empty(&node->u.root.clock)) { + ctf_clock_default(fd, depth + 1, trace); + } else { + bt_list_for_each_entry(iter, &node->u.root.clock, siblings) { + ret = ctf_clock_visit(fd, depth + 1, iter, + trace); + if (ret) { + fprintf(fd, "[error] %s: clock declaration error\n", __func__); + goto error; } } - env_clock_done = 1; } bt_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) { @@ -2897,7 +3003,8 @@ retry: bt_list_for_each_entry(iter, &node->u.root.trace, siblings) { ret = ctf_trace_visit(fd, depth + 1, iter, trace); if (ret == -EINTR) { - free_declaration_scope(trace->root_declaration_scope); + trace->restart_root_decl = 1; + bt_free_declaration_scope(trace->root_declaration_scope); /* * Need to restart creation of type * definitions, aliases and @@ -2910,6 +3017,7 @@ retry: goto error; } } + trace->restart_root_decl = 0; bt_list_for_each_entry(iter, &node->u.root.callsite, siblings) { ret = ctf_callsite_visit(fd, depth + 1, iter, trace); @@ -2958,9 +3066,9 @@ retry: return ret; error: - free_declaration_scope(trace->root_declaration_scope); + bt_free_declaration_scope(trace->root_declaration_scope); g_hash_table_destroy(trace->callsites); - g_hash_table_destroy(trace->clocks); + g_hash_table_destroy(trace->parent.clocks); return ret; } @@ -2991,32 +3099,32 @@ int ctf_destroy_metadata(struct ctf_trace *trace) if (!event) continue; if (&event->event_fields->p) - definition_unref(&event->event_fields->p); + bt_definition_unref(&event->event_fields->p); if (&event->event_context->p) - definition_unref(&event->event_context->p); + bt_definition_unref(&event->event_context->p); g_free(event); } if (&stream_def->trace_packet_header->p) - definition_unref(&stream_def->trace_packet_header->p); + bt_definition_unref(&stream_def->trace_packet_header->p); if (&stream_def->stream_event_header->p) - definition_unref(&stream_def->stream_event_header->p); + bt_definition_unref(&stream_def->stream_event_header->p); if (&stream_def->stream_packet_context->p) - definition_unref(&stream_def->stream_packet_context->p); + bt_definition_unref(&stream_def->stream_packet_context->p); if (&stream_def->stream_event_context->p) - definition_unref(&stream_def->stream_event_context->p); + bt_definition_unref(&stream_def->stream_event_context->p); g_ptr_array_free(stream_def->events_by_id, TRUE); g_free(stream_def); } if (stream->event_header_decl) - declaration_unref(&stream->event_header_decl->p); + bt_declaration_unref(&stream->event_header_decl->p); if (stream->event_context_decl) - declaration_unref(&stream->event_context_decl->p); + bt_declaration_unref(&stream->event_context_decl->p); if (stream->packet_context_decl) - declaration_unref(&stream->packet_context_decl->p); + bt_declaration_unref(&stream->packet_context_decl->p); g_ptr_array_free(stream->streams, TRUE); g_ptr_array_free(stream->events_by_id, TRUE); g_hash_table_destroy(stream->event_quark_to_id); - free_declaration_scope(stream->declaration_scope); + bt_free_declaration_scope(stream->declaration_scope); g_free(stream); } g_ptr_array_free(trace->streams, TRUE); @@ -3043,23 +3151,23 @@ int ctf_destroy_metadata(struct ctf_trace *trace) event = &event_decl->parent; if (event->fields_decl) - declaration_unref(&event->fields_decl->p); + bt_declaration_unref(&event->fields_decl->p); if (event->context_decl) - declaration_unref(&event->context_decl->p); - free_declaration_scope(event->declaration_scope); + bt_declaration_unref(&event->context_decl->p); + bt_free_declaration_scope(event->declaration_scope); g_free(event); } g_ptr_array_free(trace->event_declarations, TRUE); } if (trace->packet_header_decl) - declaration_unref(&trace->packet_header_decl->p); + bt_declaration_unref(&trace->packet_header_decl->p); - free_declaration_scope(trace->root_declaration_scope); - free_declaration_scope(trace->declaration_scope); + bt_free_declaration_scope(trace->root_declaration_scope); + bt_free_declaration_scope(trace->declaration_scope); g_hash_table_destroy(trace->callsites); - g_hash_table_destroy(trace->clocks); + g_hash_table_destroy(trace->parent.clocks); metadata_stream = container_of(trace->metadata, struct ctf_file_stream, parent); g_free(metadata_stream);