Store "tracer_name" from the trace's environment
[babeltrace.git] / formats / ctf / metadata / ctf-visitor-generate-io-struct.c
index 9acda56728c28823eac010f4bf738f7c1b4c1a73..223d7d07d02f1d7c2c010a0a2724b176dd9c6869 100644 (file)
@@ -219,7 +219,6 @@ int get_unary_signed(struct bt_list_head *head, int64_t *value)
 
        bt_list_for_each_entry(node, head, siblings) {
                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)
@@ -255,7 +254,7 @@ int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid)
                                || i != 0)
                        return -EINVAL;
                src_string = node->u.unary_expression.u.string;
-               ret = babeltrace_uuid_parse(src_string, uuid);
+               ret = bt_uuid_parse(src_string, uuid);
        }
        return ret;
 }
@@ -466,7 +465,7 @@ struct bt_declaration *ctf_type_declarator_visit(FILE *fd, int depth,
                                fprintf(fd, "[error] %s: cannot find typealias \"%s\".\n", __func__, g_quark_to_string(alias_q));
                                return NULL;
                        }
-                       if (nested_declaration->id == CTF_TYPE_INTEGER) {
+                       if (nested_declaration->id == BT_CTF_TYPE_ID_INTEGER) {
                                struct declaration_integer *integer_declaration =
                                        container_of(nested_declaration, struct declaration_integer, p);
                                /* For base to 16 for pointers (expected pretty-print) */
@@ -514,7 +513,7 @@ struct bt_declaration *ctf_type_declarator_visit(FILE *fd, int depth,
                        fprintf(fd, "[error] %s: expecting length field reference or value.\n", __func__);
                        return NULL;
                }
-               first = _bt_list_first_entry(&node_type_declarator->u.type_declarator.u.nested.length, 
+               first = _bt_list_first_entry(&node_type_declarator->u.type_declarator.u.nested.length,
                                struct ctf_node, siblings);
                if (first->type != NODE_UNARY_EXPRESSION) {
                        return NULL;
@@ -670,7 +669,7 @@ int ctf_typedef_visit(FILE *fd, int depth, struct declaration_scope *scope,
                 * Don't allow typedef and typealias of untagged
                 * variants.
                 */
-               if (type_declaration->id == CTF_TYPE_UNTAGGED_VARIANT) {
+               if (type_declaration->id == BT_CTF_TYPE_ID_UNTAGGED_VARIANT) {
                        fprintf(fd, "[error] %s: typedef of untagged variant is not permitted.\n", __func__);
                        bt_declaration_unref(type_declaration);
                        return -EPERM;
@@ -720,7 +719,7 @@ int ctf_typealias_visit(FILE *fd, int depth, struct declaration_scope *scope,
         * Don't allow typedef and typealias of untagged
         * variants.
         */
-       if (type_declaration->id == CTF_TYPE_UNTAGGED_VARIANT) {
+       if (type_declaration->id == BT_CTF_TYPE_ID_UNTAGGED_VARIANT) {
                fprintf(fd, "[error] %s: typedef of untagged variant is not permitted.\n", __func__);
                bt_declaration_unref(type_declaration);
                return -EPERM;
@@ -994,7 +993,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth,
 
        q = g_quark_from_string(enumerator->u.enumerator.id);
        if (enum_declaration->integer_declaration->signedness) {
-               int64_t start, end;
+               int64_t start = 0, end = 0;
                int nr_vals = 0;
 
                bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) {
@@ -1031,7 +1030,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth,
                last->u.s = end + 1;
                bt_enum_signed_insert(enum_declaration, start, end, q);
        } else {
-               uint64_t start, end;
+               uint64_t start = 0, end = 0;
                int nr_vals = 0;
 
                bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) {
@@ -1132,7 +1131,7 @@ struct bt_declaration *ctf_declaration_enum_visit(FILE *fd, int depth,
                        fprintf(fd, "[error] %s: unable to create container type for enumeration\n", __func__);
                        return NULL;
                }
-               if (declaration->id != CTF_TYPE_INTEGER) {
+               if (declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                        fprintf(fd, "[error] %s: container type for enumeration is not integer\n", __func__);
                        return NULL;
                }
@@ -1351,7 +1350,7 @@ struct bt_declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
                        switch (right->u.unary_expression.type) {
                        case UNARY_UNSIGNED_CONSTANT:
                                switch (right->u.unary_expression.u.unsigned_constant) {
-                               case 2: 
+                               case 2:
                                case 8:
                                case 10:
                                case 16:
@@ -1770,7 +1769,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                ret = -EPERM;
                                goto error;
                        }
-                       if (declaration->id != CTF_TYPE_STRUCT) {
+                       if (declaration->id != BT_CTF_TYPE_ID_STRUCT) {
                                ret = -EPERM;
                                goto error;
                        }
@@ -1791,7 +1790,7 @@ int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                ret = -EPERM;
                                goto error;
                        }
-                       if (declaration->id != CTF_TYPE_STRUCT) {
+                       if (declaration->id != BT_CTF_TYPE_ID_STRUCT) {
                                ret = -EPERM;
                                goto error;
                        }
@@ -1923,7 +1922,7 @@ error:
        return ret;
 }
 
+
 static
 int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_stream_declaration *stream, struct ctf_trace *trace)
 {
@@ -1983,7 +1982,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str
                                ret = -EPERM;
                                goto error;
                        }
-                       if (declaration->id != CTF_TYPE_STRUCT) {
+                       if (declaration->id != BT_CTF_TYPE_ID_STRUCT) {
                                ret = -EPERM;
                                goto error;
                        }
@@ -2004,7 +2003,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str
                                ret = -EPERM;
                                goto error;
                        }
-                       if (declaration->id != CTF_TYPE_STRUCT) {
+                       if (declaration->id != BT_CTF_TYPE_ID_STRUCT) {
                                ret = -EPERM;
                                goto error;
                        }
@@ -2025,7 +2024,7 @@ int ctf_stream_declaration_visit(FILE *fd, int depth, struct ctf_node *node, str
                                ret = -EPERM;
                                goto error;
                        }
-                       if (declaration->id != CTF_TYPE_STRUCT) {
+                       if (declaration->id != BT_CTF_TYPE_ID_STRUCT) {
                                ret = -EPERM;
                                goto error;
                        }
@@ -2178,7 +2177,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                goto error;
                        }
                        if (CTF_TRACE_FIELD_IS_SET(trace, uuid)
-                               && babeltrace_uuid_compare(uuid, trace->uuid)) {
+                               && bt_uuid_compare(uuid, trace->uuid)) {
                                fprintf(fd, "[error] %s: uuid mismatch\n", __func__);
                                ret = -EPERM;
                                goto error;
@@ -2233,7 +2232,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
                                ret = -EPERM;
                                goto error;
                        }
-                       if (declaration->id != CTF_TYPE_STRUCT) {
+                       if (declaration->id != BT_CTF_TYPE_ID_STRUCT) {
                                ret = -EPERM;
                                goto error;
                        }
@@ -2405,7 +2404,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                ret = -EPERM;
                                goto error;
                        }
-                       ret = get_unary_unsigned(&node->u.ctf_expression.right, &clock->offset_s);
+                       ret = get_unary_signed(&node->u.ctf_expression.right, &clock->offset_s);
                        if (ret) {
                                fprintf(fd, "[error] %s: unexpected unary expression for clock offset_s\n", __func__);
                                ret = -EINVAL;
@@ -2417,7 +2416,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                ret = -EPERM;
                                goto error;
                        }
-                       ret = get_unary_unsigned(&node->u.ctf_expression.right, &clock->offset);
+                       ret = get_unary_signed(&node->u.ctf_expression.right, &clock->offset);
                        if (ret) {
                                fprintf(fd, "[error] %s: unexpected unary expression for clock offset\n", __func__);
                                ret = -EINVAL;
@@ -2792,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;
 
This page took 0.02691 seconds and 4 git commands to generate.