Fix clock freq

[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 b0be8721930ea35bd65a514db2145bb334a6ec7d..2d3361cbdc5d3d889cbeed4ff7b281e0c8b2473c 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -2160,7 +2160,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        clock->name = g_quark_from_string(right);
                        g_free(right);
-                       CTF_EVENT_SET_FIELD(clock, name);
+                       CTF_CLOCK_SET_FIELD(clock, name);
                } else if (!strcmp(left, "uuid")) {
                        char *right;
 
@@ -2191,7 +2191,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        clock->description = right;
                } else if (!strcmp(left, "freq")) {
-                       if (clock->freq) {
+                       if (CTF_CLOCK_FIELD_IS_SET(clock, freq)) {
                                fprintf(fd, "[error] %s: freq already declared in clock declaration\n", __func__);
                                ret = -EPERM;
                                goto error;
@@ -2202,6 +2202,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                ret = -EINVAL;
                                goto error;
                        }
+                       CTF_CLOCK_SET_FIELD(clock, freq);
                } else if (!strcmp(left, "precision")) {
                        if (clock->precision) {
                                fprintf(fd, "[error] %s: precision already declared in clock declaration\n", __func__);
@@ -2273,6 +2274,8 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
        struct ctf_clock *clock;
 
        clock = g_new0(struct ctf_clock, 1);
+       /* Default clock frequency is set to 1000000000 */
+       clock->freq = 1000000000ULL;
        cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
                ret = ctf_clock_declaration_visit(fd, depth + 1, iter, clock, trace);
                if (ret)
@@ -2283,6 +2286,12 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
                fprintf(fd, "[error] %s: missing namefield in clock declaration\n", __func__);
                goto error;
        }
+       if (g_hash_table_size(trace->clocks) > 0) {
+               fprintf(stderr, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n");
+               ret = -EINVAL;
+               goto error;
+       }
+       trace->single_clock = clock;
        g_hash_table_insert(trace->clocks, (gpointer) (unsigned long) clock->name, clock);
        return 0;
 
@@ -2327,6 +2336,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                                goto error;     /* ret is 0, so not an actual error, just warn. */
                        }
                        env->vpid = (int) v;
+                       printf_verbose("env.vpid = %d\n", env->vpid);
                } else if (!strcmp(left, "procname")) {
                        char *right;
 
@@ -2341,6 +2351,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        strncpy(env->procname, right, TRACER_ENV_LEN);
                        env->procname[TRACER_ENV_LEN - 1] = '\0';
+                       printf_verbose("env.procname = %s\n", env->procname);
                } else if (!strcmp(left, "domain")) {
                        char *right;
 
@@ -2355,6 +2366,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        strncpy(env->domain, right, TRACER_ENV_LEN);
                        env->domain[TRACER_ENV_LEN - 1] = '\0';
+                       printf_verbose("env.domain = %s\n", env->domain);
                } else if (!strcmp(left, "sysname")) {
                        char *right;
 
@@ -2369,6 +2381,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        strncpy(env->sysname, right, TRACER_ENV_LEN);
                        env->sysname[TRACER_ENV_LEN - 1] = '\0';
+                       printf_verbose("env.sysname = %s\n", env->sysname);
                } else if (!strcmp(left, "release")) {
                        char *right;
 
@@ -2383,6 +2396,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        strncpy(env->release, right, TRACER_ENV_LEN);
                        env->release[TRACER_ENV_LEN - 1] = '\0';
+                       printf_verbose("env.release = %s\n", env->release);
                } else if (!strcmp(left, "version")) {
                        char *right;
 
@@ -2397,6 +2411,7 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
                        }
                        strncpy(env->version, right, TRACER_ENV_LEN);
                        env->version[TRACER_ENV_LEN - 1] = '\0';
+                       printf_verbose("env.version = %s\n", env->version);
                } else {
                        printf_verbose("%s: attribute \"%s\" is unknown in environment declaration.\n", __func__, left);
                }