Add --clock-force-correlate option

[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 5b26ec66c1ab142b02524de7d5f958ff356b9ea4..4f604d1cee2a8e610a84e7ae7e6fc767c15c3dac 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -39,6 +39,8 @@
 #define _cds_list_first_entry(ptr, type, member)       \
        cds_list_entry((ptr)->next, type, member)
 
+int opt_clock_force_correlate;
+
 static
 struct declaration *ctf_type_specifier_list_visit(FILE *fd,
                int depth, struct ctf_node *type_specifier_list,
@@ -2160,7 +2162,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 +2193,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 +2204,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__);
@@ -2280,13 +2283,24 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
                if (ret)
                        goto error;
        }
+       if (opt_clock_force_correlate) {
+               /*
+                * User requested to forcibly correlate the clock
+                * sources, even if we have no correlatation
+                * information.
+                */
+               if (!clock->absolute) {
+                       fprintf(fd, "[warning] Forcibly correlating trace clock sources (--clock-force-correlate).\n");
+               }
+               clock->absolute = 1;
+       }
        if (!CTF_CLOCK_FIELD_IS_SET(clock, name)) {
                ret = -EPERM;
                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");
+               fprintf(fd, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n");
                ret = -EINVAL;
                goto error;
        }
@@ -2300,6 +2314,35 @@ error:
        return ret;
 }
 
+static
+void ctf_clock_default(FILE *fd, int depth, struct ctf_trace *trace)
+{
+       struct ctf_clock *clock;
+
+       clock = g_new0(struct ctf_clock, 1);
+       clock->name = g_quark_from_string("monotonic");
+       clock->uuid = 0;
+       clock->description = g_strdup("Default clock");
+       /* Default clock frequency is set to 1000000000 */
+       clock->freq = 1000000000ULL;
+       if (opt_clock_force_correlate) {
+               /*
+                * User requested to forcibly correlate the clock
+                * sources, even if we have no correlatation
+                * information.
+                */
+               if (!clock->absolute) {
+                       fprintf(fd, "[warning] Forcibly correlating trace clock sources (--clock-force-correlate).\n");
+               }
+               clock->absolute = 1;
+       } else {
+               clock->absolute = 0;    /* Not an absolute reference across traces */
+       }
+
+       trace->single_clock = clock;
+       g_hash_table_insert(trace->clocks, (gpointer) (unsigned long) clock->name, clock);
+}
+
 static
 void clock_free(gpointer data)
 {
@@ -2515,12 +2558,16 @@ retry:
                         * declarations need to query clock hash table,
                         * so clock need to be treated first.
                         */
-                       cds_list_for_each_entry(iter, &node->u.root.clock, siblings) {
-                               ret = ctf_clock_visit(fd, depth + 1, iter,
-                                                     trace);
-                               if (ret) {
-                                       fprintf(fd, "[error] %s: clock declaration error\n", __func__);
-                                       goto error;
+                       if (cds_list_empty(&node->u.root.clock)) {
+                               ctf_clock_default(fd, depth + 1, trace);
+                       } else {
+                               cds_list_for_each_entry(iter, &node->u.root.clock, siblings) {
+                                       ret = ctf_clock_visit(fd, depth + 1, iter,
+                                                             trace);
+                                       if (ret) {
+                                               fprintf(fd, "[error] %s: clock declaration error\n", __func__);
+                                               goto error;
+                                       }
                                }
                        }
                        env_clock_done = 1;