X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=17479ebaec39f384056ce479d68db3552c6c4560;hb=139fdb6040119758ffce99e19e1834600d8d1e5f;hp=9ade8c48fd679dcb1ec094a26604065cb7322301;hpb=13fad8b6d8ad53a55baca25234a0c59aeff83a3b;p=babeltrace.git diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c index 9ade8c48..17479eba 100644 --- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c +++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c @@ -58,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); @@ -95,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, "."); @@ -129,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: @@ -184,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++; } @@ -215,11 +218,12 @@ 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_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; @@ -228,7 +232,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++; } @@ -245,10 +249,11 @@ 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); } @@ -272,7 +277,8 @@ struct ctf_clock *trace_clock_lookup(struct ctf_trace *trace, GQuark 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: @@ -411,12 +417,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) { /* @@ -426,7 +432,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) { @@ -445,7 +453,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; @@ -460,7 +468,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); @@ -483,7 +491,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 */ @@ -500,7 +508,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: @@ -526,7 +536,9 @@ 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); @@ -538,7 +550,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth, break; } default: - assert(0); + return NULL; } /* Pass it as content of outer container */ @@ -562,7 +574,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, @@ -575,12 +587,12 @@ 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); bt_declaration_unref(field_declaration); @@ -600,7 +612,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, @@ -612,12 +624,12 @@ 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); bt_declaration_unref(field_declaration); @@ -635,7 +647,7 @@ 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, @@ -655,7 +667,7 @@ int ctf_typedef_visit(FILE *fd, int depth, struct declaration_scope *scope, 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; @@ -670,7 +682,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; @@ -722,7 +734,7 @@ 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; bt_declaration_unref(type_declaration); @@ -744,7 +756,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, @@ -753,7 +765,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, @@ -773,7 +785,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; } @@ -817,13 +829,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, @@ -838,9 +850,10 @@ 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); bt_declaration_ref(&struct_declaration->p); return &struct_declaration->p; @@ -850,7 +863,7 @@ 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); @@ -867,7 +880,7 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, 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; @@ -880,10 +893,11 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, if (name) { int ret; - ret = register_struct_declaration(g_quark_from_string(name), + ret = bt_register_struct_declaration(g_quark_from_string(name), struct_declaration, declaration_scope); - assert(!ret); + if (ret) + return NULL; } return &struct_declaration->p; } @@ -894,7 +908,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, @@ -910,23 +924,24 @@ 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); 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; @@ -938,10 +953,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; } } /* @@ -951,7 +967,7 @@ 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; bt_declaration_unref(&untagged_variant_declaration->p); @@ -979,7 +995,8 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, 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 @@ -1007,7 +1024,7 @@ 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; int nr_vals = 0; @@ -1015,7 +1032,8 @@ int ctf_enumerator_list_visit(FILE *fd, int depth, 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 @@ -1047,13 +1065,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, @@ -1061,7 +1079,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; @@ -1074,9 +1092,10 @@ 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); bt_declaration_ref(&enum_declaration->p); return &enum_declaration->p; @@ -1084,7 +1103,7 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, /* 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); @@ -1092,7 +1111,7 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, } } 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__); @@ -1114,7 +1133,7 @@ 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); + 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; @@ -1132,10 +1151,11 @@ 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); + if (ret) + return NULL; bt_declaration_unref(&enum_declaration->p); } return &enum_declaration->p; @@ -1146,24 +1166,28 @@ 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 = bt_lookup_declaration(id_q, declaration_scope); + if (!declaration) + return NULL; bt_declaration_ref(declaration); return declaration; } @@ -1228,7 +1252,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; } @@ -1263,7 +1287,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) { @@ -1282,7 +1306,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) @@ -1442,14 +1467,14 @@ 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) { @@ -1464,7 +1489,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) @@ -1522,13 +1548,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) { @@ -1542,7 +1568,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", @@ -1558,13 +1585,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) @@ -1572,11 +1599,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; @@ -1665,6 +1694,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; @@ -1715,7 +1746,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__); @@ -1736,7 +1767,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__); @@ -1816,7 +1847,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node, 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); @@ -1867,7 +1898,7 @@ error: bt_declaration_unref(&event->fields_decl->p); if (event->context_decl) bt_declaration_unref(&event->context_decl->p); - free_declaration_scope(event->declaration_scope); + bt_free_declaration_scope(event->declaration_scope); g_free(event_decl); return ret; } @@ -1901,6 +1932,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__); @@ -1915,7 +1948,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__); @@ -1936,7 +1969,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__); @@ -1957,7 +1990,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__); @@ -2003,7 +2036,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_declaration *stream; 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(); @@ -2017,7 +2050,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; @@ -2048,7 +2081,7 @@ error: 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; } @@ -2081,6 +2114,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__); @@ -2131,8 +2166,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) { @@ -2155,7 +2192,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__); @@ -2199,7 +2236,7 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace 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) { @@ -2226,7 +2263,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; @@ -2241,7 +2278,7 @@ error: } 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; } @@ -2258,6 +2295,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; @@ -2398,7 +2437,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) { @@ -2476,6 +2515,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; @@ -2647,6 +2688,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; @@ -2762,6 +2805,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)) { @@ -2769,14 +2817,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); @@ -2841,7 +2891,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 @@ -2868,7 +2918,7 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node, 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); @@ -2876,7 +2926,7 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node, 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: @@ -2910,7 +2960,7 @@ 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); + bt_free_declaration_scope(trace->root_declaration_scope); /* * Need to restart creation of type * definitions, aliases and @@ -2971,7 +3021,7 @@ 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); return ret; @@ -3029,7 +3079,7 @@ int ctf_destroy_metadata(struct ctf_trace *trace) 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); @@ -3059,7 +3109,7 @@ int ctf_destroy_metadata(struct ctf_trace *trace) bt_declaration_unref(&event->fields_decl->p); if (event->context_decl) bt_declaration_unref(&event->context_decl->p); - free_declaration_scope(event->declaration_scope); + bt_free_declaration_scope(event->declaration_scope); g_free(event); } @@ -3068,8 +3118,8 @@ int ctf_destroy_metadata(struct ctf_trace *trace) if (trace->packet_header_decl) 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);