ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

[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 40ba4aa03ba6222802d6ae55f5aa39167478a658..13b79f007e434b150efac45bc4369d23a1dc58c4 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -278,7 +278,7 @@ struct ctf_event_declaration *stream_event_lookup(struct ctf_stream_declaration
 static
 struct ctf_clock *trace_clock_lookup(struct ctf_trace *trace, GQuark clock_name)
 {
-       return g_hash_table_lookup(trace->parent.clocks, (gpointer) (unsigned long) clock_name);
+       return g_hash_table_lookup(trace->parent.clocks, GUINT_TO_POINTER(clock_name));
 }
 
 static
@@ -1114,7 +1114,7 @@ struct bt_declaration *ctf_declaration_enum_visit(FILE *fd, int depth,
                        }
                }
                if (!container_type) {
-                       declaration = bt_lookup_declaration(g_quark_from_static_string("int"),
+                       declaration = bt_lookup_declaration(g_quark_from_string("int"),
                                                         declaration_scope);
                        if (!declaration) {
                                fprintf(fd, "[error] %s: \"int\" type declaration missing for enumeration\n", __func__);
@@ -1907,7 +1907,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
                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;
        g_hash_table_insert(event->stream->event_quark_to_id,
-                           (gpointer) (unsigned long) event->name,
+                           GUINT_TO_POINTER(event->name),
                            &event->id);
        g_ptr_array_add(trace->event_declarations, event_decl);
        return 0;
@@ -2075,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
-                   || bt_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_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;
@@ -2293,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
-                   || bt_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_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;
@@ -2491,7 +2491,7 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
                goto error;
        }
        trace->parent.single_clock = clock;
-       g_hash_table_insert(trace->parent.clocks, (gpointer) (unsigned long) clock->name, clock);
+       g_hash_table_insert(trace->parent.clocks, GUINT_TO_POINTER(clock->name), clock);
        return 0;
 
 error:
@@ -2526,7 +2526,7 @@ void ctf_clock_default(FILE *fd, int depth, struct ctf_trace *trace)
        }
 
        trace->parent.single_clock = clock;
-       g_hash_table_insert(trace->parent.clocks, (gpointer) (unsigned long) clock->name, clock);
+       g_hash_table_insert(trace->parent.clocks, GUINT_TO_POINTER(clock->name), clock);
 }
 
 static
@@ -2683,12 +2683,12 @@ int ctf_callsite_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_tr
        }
 
        cs_dups = g_hash_table_lookup(trace->callsites,
-               (gpointer) (unsigned long) callsite->name);
+               GUINT_TO_POINTER(callsite->name));
        if (!cs_dups) {
                cs_dups = g_new0(struct ctf_callsite_dups, 1);
                BT_INIT_LIST_HEAD(&cs_dups->head);
                g_hash_table_insert(trace->callsites,
-                       (gpointer) (unsigned long) callsite->name, cs_dups);
+                       GUINT_TO_POINTER(callsite->name), cs_dups);
        }
        bt_list_add_tail(&callsite->node, &cs_dups->head);
        return 0;
@@ -2791,6 +2791,22 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        env->domain[TRACER_ENV_LEN - 1] = '\0';
                        printf_verbose("env.domain = \"%s\"\n", env->domain);
                        g_free(right);
+               } else if (!strcmp(left, "tracer_name")) {
+                       char *right;
+
+                       if (env->tracer_name[0]) {
+                               fprintf(fd, "[warning] %s: duplicated env tracer_name\n", __func__);
+                               goto error;     /* ret is 0, so not an actual error, just warn. */
+                       }
+                       right = concatenate_unary_strings(&node->u.ctf_expression.right);
+                       if (!right) {
+                               fprintf(fd, "[warning] %s: unexpected unary expression for env tracer_name\n", __func__);
+                               goto error;     /* ret is 0, so not an actual error, just warn. */
+                       }
+                       strncpy(env->tracer_name, right, TRACER_ENV_LEN);
+                       env->tracer_name[TRACER_ENV_LEN - 1] = '\0';
+                       printf_verbose("env.tracer_name = \"%s\"\n", env->tracer_name);
+                       g_free(right);
                } else if (!strcmp(left, "sysname")) {
                        char *right;