namespace definition_ref and definition_unref

[babeltrace.git] / formats / ctf / metadata / ctf-visitor-generate-io-struct.c

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 64c19677d346d0f34646ee9d00a1998b1bcc8833..9ade8c48fd679dcb1ec094a26604065cb7322301 100644 (file)
--- 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 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 <stdio.h>
  */
 
 #include <stdio.h>


@@ -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;
                        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_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;
                }
                        declaration = &array_declaration->p;
                        break;
                }


@@ -524,7 +532,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth,
                                g_free(length_name);
                                return NULL;
                        }
                                g_free(length_name);
                                return NULL;
                        }

-                       declaration_unref(nested_declaration);
+                       bt_declaration_unref(nested_declaration);

                        declaration = &sequence_declaration->p;
                        g_free(length_name);
                        break;
                        declaration = &sequence_declaration->p;
                        g_free(length_name);
                        break;


@@ -575,7 +583,7 @@ int ctf_struct_type_declarators_visit(FILE *fd, int depth,
                struct_declaration_add_field(struct_declaration,
                                             g_quark_to_string(field_name),
                                             field_declaration);
                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;
 }
        }
        return 0;
 }


@@ -612,7 +620,7 @@ int ctf_variant_type_declarators_visit(FILE *fd, int depth,
                untagged_variant_declaration_add_field(untagged_variant_declaration,
                                              g_quark_to_string(field_name),
                                              field_declaration);
                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;
 }
        }
        return 0;
 }


@@ -644,7 +652,7 @@ 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__);
                 */
                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);
                        return -EPERM;
                }
                ret = register_declaration(identifier, type_declaration, scope);


@@ -652,7 +660,7 @@ int ctf_typedef_visit(FILE *fd, int depth, struct declaration_scope *scope,
                        type_declaration->declaration_free(type_declaration);
                        return ret;
                }
                        type_declaration->declaration_free(type_declaration);
                        return ret;
                }

-               declaration_unref(type_declaration);
+               bt_declaration_unref(type_declaration);

        }
        return 0;
 }
        }
        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__);
         */
        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;
        }
        /*
                return -EPERM;
        }
        /*


@@ -717,7 +725,7 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope,
        err = register_declaration(alias_q, type_declaration, scope);
        if (err)
                goto error;
        err = register_declaration(alias_q, type_declaration, scope);
        if (err)
                goto error;

-       declaration_unref(type_declaration);
+       bt_declaration_unref(type_declaration);

        return 0;
 
 error:
        return 0;
 
 error:


@@ -823,7 +831,6 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
 {
        struct declaration_struct *struct_declaration;
        struct ctf_node *iter;
 {
        struct declaration_struct *struct_declaration;
        struct ctf_node *iter;

-       int ret;

 
        /*
         * For named struct (without body), lookup in
 
        /*
         * For named struct (without body), lookup in


@@ -835,7 +842,7 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
                struct_declaration =
                        lookup_struct_declaration(g_quark_from_string(name),
                                                  declaration_scope);
                struct_declaration =
                        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;
                return &struct_declaration->p;
        } else {
                uint64_t min_align_value = 0;


@@ -851,6 +858,8 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
                        }
                }
                if (!bt_list_empty(min_align)) {
                        }
                }
                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 = get_unary_unsigned(min_align, &min_align_value);
                        if (ret) {
                                fprintf(fd, "[error] %s: unexpected unary expression for structure \"align\" attribute\n", __func__);


@@ -861,12 +870,16 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
                struct_declaration = struct_declaration_new(declaration_scope,
                                                            min_align_value);
                bt_list_for_each_entry(iter, declaration_list, siblings) {
                struct_declaration = 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 = ctf_struct_declaration_list_visit(fd, depth + 1, iter,
                                struct_declaration, trace);
                        if (ret)
                                goto error_free_declaration;
                }
                if (name) {

+                       int ret;
+

                        ret = register_struct_declaration(g_quark_from_string(name),
                                        struct_declaration,
                                        declaration_scope);
                        ret = register_struct_declaration(g_quark_from_string(name),
                                        struct_declaration,
                                        declaration_scope);


@@ -890,7 +903,6 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd,
        struct declaration_untagged_variant *untagged_variant_declaration;
        struct declaration_variant *variant_declaration;
        struct ctf_node *iter;
        struct declaration_untagged_variant *untagged_variant_declaration;
        struct declaration_variant *variant_declaration;
        struct ctf_node *iter;

-       int ret;

 
        /*
         * For named variant (without body), lookup in
 
        /*
         * For named variant (without body), lookup in


@@ -902,7 +914,7 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd,
                untagged_variant_declaration =
                        lookup_variant_declaration(g_quark_from_string(name),
                                                   declaration_scope);
                untagged_variant_declaration =
                        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 */
        } else {
                /* For unnamed variant, create type */
                /* For named variant (with body), create type and add to declaration scope */


@@ -916,12 +928,16 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd,
                }
                untagged_variant_declaration = untagged_variant_declaration_new(declaration_scope);
                bt_list_for_each_entry(iter, declaration_list, siblings) {
                }
                untagged_variant_declaration = untagged_variant_declaration_new(declaration_scope);
                bt_list_for_each_entry(iter, declaration_list, siblings) {

+                       int ret;
+

                        ret = ctf_variant_declaration_list_visit(fd, depth + 1, iter,
                                untagged_variant_declaration, trace);
                        if (ret)
                                goto error;
                }
                if (name) {
                        ret = ctf_variant_declaration_list_visit(fd, depth + 1, iter,
                                untagged_variant_declaration, trace);
                        if (ret)
                                goto error;
                }
                if (name) {

+                       int ret;
+

                        ret = register_variant_declaration(g_quark_from_string(name),
                                        untagged_variant_declaration,
                                        declaration_scope);
                        ret = register_variant_declaration(g_quark_from_string(name),
                                        untagged_variant_declaration,
                                        declaration_scope);


@@ -938,7 +954,7 @@ struct declaration *ctf_declaration_variant_visit(FILE *fd,
                variant_declaration = variant_declaration_new(untagged_variant_declaration, choice);
                if (!variant_declaration)
                        goto error;
                variant_declaration = 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:
                return &variant_declaration->p;
        }
 error:


@@ -1051,7 +1067,6 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth,
        struct last_enum_value last_value;
        struct ctf_node *iter;
        GQuark dummy_id;
        struct last_enum_value last_value;
        struct ctf_node *iter;
        GQuark dummy_id;

-       int ret;

 
        /*
         * For named enum (without body), lookup in
 
        /*
         * For named enum (without body), lookup in


@@ -1063,7 +1078,7 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth,
                enum_declaration =
                        lookup_enum_declaration(g_quark_from_string(name),
                                                declaration_scope);
                enum_declaration =
                        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 */
                return &enum_declaration->p;
        } else {
                /* For unnamed enum, create type */


@@ -1100,24 +1115,28 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth,
                }
                integer_declaration = container_of(declaration, struct declaration_integer, p);
                enum_declaration = enum_declaration_new(integer_declaration);
                }
                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 */
+               bt_declaration_unref(&integer_declaration->p);  /* leave ref to enum */

                if (enum_declaration->integer_declaration->signedness) {
                        last_value.u.s = 0;
                } else {
                        last_value.u.u = 0;
                }
                bt_list_for_each_entry(iter, enumerator_list, siblings) {
                if (enum_declaration->integer_declaration->signedness) {
                        last_value.u.s = 0;
                } else {
                        last_value.u.u = 0;
                }
                bt_list_for_each_entry(iter, enumerator_list, siblings) {

+                       int ret;
+

                        ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration,
                                        &last_value);
                        if (ret)
                                goto error;
                }
                if (name) {
                        ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration,
                                        &last_value);
                        if (ret)
                                goto error;
                }
                if (name) {

+                       int ret;
+

                        ret = register_enum_declaration(g_quark_from_string(name),
                                        enum_declaration,
                                        declaration_scope);
                        assert(!ret);
                        ret = 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;
        }
                }
                return &enum_declaration->p;
        }


@@ -1145,7 +1164,7 @@ struct declaration *ctf_declaration_type_specifier_visit(FILE *fd, int depth,
        id_q = g_quark_from_string(str_c);
        g_free(str_c);
        declaration = lookup_declaration(id_q, declaration_scope);
        id_q = g_quark_from_string(str_c);
        g_free(str_c);
        declaration = lookup_declaration(id_q, declaration_scope);

-       declaration_ref(declaration);
+       bt_declaration_ref(declaration);

        return declaration;
 }
 
        return declaration;
 }
 


@@ -1845,9 +1864,9 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
 
 error:
        if (event->fields_decl)
 
 error:
        if (event->fields_decl)

-               declaration_unref(&event->fields_decl->p);
+               bt_declaration_unref(&event->fields_decl->p);

        if (event->context_decl)
        if (event->context_decl)

-               declaration_unref(&event->context_decl->p);
+               bt_declaration_unref(&event->context_decl->p);

        free_declaration_scope(event->declaration_scope);
        g_free(event_decl);
        return ret;
        free_declaration_scope(event->declaration_scope);
        g_free(event_decl);
        return ret;


@@ -2021,11 +2040,11 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
 
 error:
        if (stream->event_header_decl)
 
 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)
        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)
        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);
        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);


@@ -2217,7 +2236,7 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
 
 error:
        if (trace->packet_header_decl) {
 
 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);
                trace->packet_header_decl = NULL;
        }
        g_ptr_array_free(trace->streams, TRUE);


@@ -2832,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;
                        node, trace->root_declaration_scope, trace);
                if (!declaration)
                        return -ENOMEM;

-               declaration_unref(declaration);
+               bt_declaration_unref(declaration);

                break;
        }
        default:
                break;
        }
        default:


@@ -2960,18 +2979,20 @@ error:
 
 int ctf_destroy_metadata(struct ctf_trace *trace)
 {
 
 int ctf_destroy_metadata(struct ctf_trace *trace)
 {

-       int i, j, k;
+       int i;

        struct ctf_file_stream *metadata_stream;
 
        if (trace->streams) {
                for (i = 0; i < trace->streams->len; i++) {
                        struct ctf_stream_declaration *stream;
        struct ctf_file_stream *metadata_stream;
 
        if (trace->streams) {
                for (i = 0; i < trace->streams->len; i++) {
                        struct ctf_stream_declaration *stream;

+                       int j;

 
                        stream = g_ptr_array_index(trace->streams, i);
                        if (!stream)
                                continue;
                        for (j = 0; j < stream->streams->len; j++) {
                                struct ctf_stream_definition *stream_def;
 
                        stream = g_ptr_array_index(trace->streams, i);
                        if (!stream)
                                continue;
                        for (j = 0; j < stream->streams->len; j++) {
                                struct ctf_stream_definition *stream_def;

+                               int k;

 
                                stream_def = g_ptr_array_index(stream->streams, j);
                                if (!stream_def)
 
                                stream_def = g_ptr_array_index(stream->streams, j);
                                if (!stream_def)


@@ -2983,28 +3004,28 @@ int ctf_destroy_metadata(struct ctf_trace *trace)
                                        if (!event)
                                                continue;
                                        if (&event->event_fields->p)
                                        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)
                                        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)
                                        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)
                                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)
                                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)
                                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)
                                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)
                        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)
                        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);
                        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);


@@ -3035,9 +3056,9 @@ int ctf_destroy_metadata(struct ctf_trace *trace)
 
                        event = &event_decl->parent;
                        if (event->fields_decl)
 
                        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)
                        if (event->context_decl)

-                               declaration_unref(&event->context_decl->p);
+                               bt_declaration_unref(&event->context_decl->p);

                        free_declaration_scope(event->declaration_scope);
 
                        g_free(event);
                        free_declaration_scope(event->declaration_scope);
 
                        g_free(event);


@@ -3045,7 +3066,7 @@ int ctf_destroy_metadata(struct ctf_trace *trace)
                g_ptr_array_free(trace->event_declarations, TRUE);
        }
        if (trace->packet_header_decl)
                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);
 
        free_declaration_scope(trace->root_declaration_scope);
        free_declaration_scope(trace->declaration_scope);