X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=d1b453e4551bab659d5cd63106e58012a10ffb1f;hb=ffb12bdc29764f89f642d064daca941a5fd5c775;hp=5104c62bc649c60518b05c711f50fd470b745e76;hpb=6ca30a47e61ba2c3e5376bbc0d8b90b634bb8e84;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 5104c62b..d1b453e4 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 @@ -437,7 +445,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 +460,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); @@ -501,14 +509,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,13 +526,13 @@ 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); + 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; @@ -567,15 +575,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; } @@ -604,15 +612,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; } @@ -644,15 +652,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; } @@ -694,7 +702,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 +722,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: @@ -832,9 +840,9 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd, if (!has_body) { assert(name); 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; @@ -842,7 +850,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); @@ -859,7 +867,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; @@ -872,7 +880,7 @@ 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); @@ -904,21 +912,21 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd, if (!has_body) { assert(name); 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; @@ -930,7 +938,7 @@ 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); @@ -943,10 +951,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: @@ -999,7 +1007,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; @@ -1039,7 +1047,7 @@ 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; } @@ -1068,15 +1076,15 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth, if (!has_body) { assert(name); 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); @@ -1084,7 +1092,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__); @@ -1106,8 +1114,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 { @@ -1124,11 +1132,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); - declaration_unref(&enum_declaration->p); + bt_declaration_unref(&enum_declaration->p); } return &enum_declaration->p; } @@ -1155,8 +1163,8 @@ struct declaration *ctf_declaration_type_specifier_visit(FILE *fd, int depth, 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); + bt_declaration_ref(declaration); return declaration; } @@ -1434,7 +1442,7 @@ 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; @@ -1514,7 +1522,7 @@ 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; } @@ -1550,7 +1558,7 @@ 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; } @@ -1808,7 +1816,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); @@ -1856,10 +1864,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; } @@ -1995,7 +2003,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(); @@ -2009,7 +2017,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; @@ -2032,15 +2040,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; } @@ -2191,7 +2199,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) { @@ -2218,7 +2226,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; @@ -2228,12 +2236,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; } @@ -2843,7 +2851,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: @@ -2868,7 +2876,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: @@ -2902,7 +2910,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 @@ -2963,7 +2971,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; @@ -2996,32 +3004,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); @@ -3048,20 +3056,20 @@ 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);