Show loglevel information only with value

[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 a8aebf919fc3e2d77b43b02d985bd3f0cab67104..6a8e1ab6a69e17107059d5a8919311eb5535df9b 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1649,36 +1649,22 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                goto error;
                        }
                        event->fields_decl = container_of(declaration, struct declaration_struct, p);
-               } else if (!strcmp(left, "loglevel.identifier")) {
-                       char *right;
+               } else if (!strcmp(left, "loglevel")) {
+                       int64_t loglevel = -1;
 
-                       if (CTF_EVENT_FIELD_IS_SET(event, loglevel_identifier)) {
-                               fprintf(fd, "[error] %s: identifier already declared in event declaration\n", __func__);
+                       if (CTF_EVENT_FIELD_IS_SET(event, loglevel)) {
+                               fprintf(fd, "[error] %s: loglevel already declared in event declaration\n", __func__);
                                ret = -EPERM;
                                goto error;
                        }
-                       right = concatenate_unary_strings(&node->u.ctf_expression.right);
-                       if (!right) {
-                               fprintf(fd, "[error] %s: unexpected unary expression for event identifier\n", __func__);
-                               ret = -EINVAL;
-                               goto error;
-                       }
-                       event->loglevel_identifier = g_quark_from_string(right);
-                       g_free(right);
-                       CTF_EVENT_SET_FIELD(event, loglevel_identifier);
-               } else if (!strcmp(left, "loglevel.value")) {
-                       if (CTF_EVENT_FIELD_IS_SET(event, loglevel_value)) {
-                               fprintf(fd, "[error] %s: loglevel value already declared in event declaration\n", __func__);
-                               ret = -EPERM;
-                               goto error;
-                       }
-                       ret = get_unary_signed(&node->u.ctf_expression.right, &event->loglevel_value);
+                       ret = get_unary_signed(&node->u.ctf_expression.right, &loglevel);
+                       event->loglevel = (int) loglevel;
                        if (ret) {
-                               fprintf(fd, "[error] %s: unexpected unary expression for event loglevel value\n", __func__);
+                               fprintf(fd, "[error] %s: unexpected unary expression for event loglevel\n", __func__);
                                ret = -EINVAL;
                                goto error;
                        }
-                       CTF_EVENT_SET_FIELD(event, loglevel_value);
+                       CTF_EVENT_SET_FIELD(event, loglevel);
                } else {
                        fprintf(fd, "[warning] %s: attribute \"%s\" is unknown in event declaration.\n", __func__, left);
                        /* Fall-through after warning */
@@ -1705,6 +1691,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
 
        event = g_new0(struct ctf_event, 1);
        event->declaration_scope = new_declaration_scope(parent_declaration_scope);
+       event->loglevel = -1;
        cds_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
                ret = ctf_event_declaration_visit(fd, depth + 1, iter, event, trace);
                if (ret)
@@ -2241,6 +2228,17 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                ret = -EINVAL;
                                goto error;
                        }
+               } else if (!strcmp(left, "absolute")) {
+                       struct ctf_node *right;
+
+                       right = _cds_list_first_entry(&node->u.ctf_expression.right, struct ctf_node, siblings);
+                       ret = get_boolean(fd, depth, right);
+                       if (ret < 0) {
+                               fprintf(fd, "[error] %s: unexpected \"absolute\" right member\n", __func__);
+                               ret = -EINVAL;
+                               goto error;
+                       }
+                       clock->absolute = ret;
                } else {
                        fprintf(fd, "[warning] %s: attribute \"%s\" is unknown in clock declaration.\n", __func__, left);
                }
@@ -2293,6 +2291,13 @@ void clock_free(gpointer data)
        g_free(clock);
 }
 
+static
+int ctf_env_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
+{
+       fprintf(fd, "[warning] %s: environment declaration support not implement yet.\n", __func__);
+       return 0;       /* continue */
+}
+
 static
 int ctf_root_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
 {
@@ -2344,7 +2349,7 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
 {
        int ret = 0;
        struct ctf_node *iter;
-       int clock_done = 0;
+       int env_clock_done = 0;
 
        printf_verbose("CTF visitor: metadata construction... ");
        trace->byte_order = byte_order;
@@ -2356,7 +2361,16 @@ retry:
 
        switch (node->type) {
        case NODE_ROOT:
-               if (!clock_done) {
+               if (!env_clock_done) {
+                       cds_list_for_each_entry(iter, &node->u.root.env, siblings) {
+                               ret = ctf_env_visit(fd, depth + 1, iter,
+                                                   trace);
+                               if (ret) {
+                                       fprintf(fd, "[error] %s: env declaration error\n", __func__);
+                                       goto error;
+                               }
+                       }
+
                        /*
                         * declarations need to query clock hash table,
                         * so clock need to be treated first.
@@ -2369,7 +2383,7 @@ retry:
                                        goto error;
                                }
                        }
-                       clock_done = 1;
+                       env_clock_done = 1;
                }
                cds_list_for_each_entry(iter, &node->u.root.declaration_list,
                                        siblings) {