ir: bt_ctf_trace_add_stream_class(): add stream class's clock

[babeltrace.git] / formats / ctf / ir / trace.c

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index dce9474baa787f33faea3c797880e7f67ebb4757..2c0e7670f627600ef4bf7dc8ab3e7cbbd1aa02be 100644 (file)
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -31,8 +31,10 @@
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/event-internal.h>
+#include <babeltrace/ctf-ir/event-class.h>
+#include <babeltrace/ctf-ir/event-class-internal.h>
 #include <babeltrace/ctf-writer/functor-internal.h>
-#include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/ctf-ir/validation-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
@@ -385,6 +387,10 @@ int bt_ctf_trace_add_clock(struct bt_ctf_trace *trace,
 
        bt_get(clock);
        g_ptr_array_add(trace->clocks, clock);
+
+       if (trace->frozen) {
+               bt_ctf_clock_freeze(clock);
+       }
 end:
        return ret;
 }
@@ -434,6 +440,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
        struct bt_ctf_field_type *event_header_type = NULL;
        struct bt_ctf_field_type *stream_event_ctx_type = NULL;
        int event_class_count;
+       struct bt_ctf_clock *clock_to_add_to_trace = NULL;
 
        if (!trace || !stream_class) {
                ret = -1;
@@ -453,6 +460,32 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
                }
        }
 
+       /*
+        * If the stream class has a clock, register this clock to this
+        * trace if not already done.
+        */
+       if (stream_class->clock) {
+               const char *clock_name =
+                       bt_ctf_clock_get_name(stream_class->clock);
+               struct bt_ctf_clock *trace_clock;
+
+               assert(clock_name);
+               trace_clock = bt_ctf_trace_get_clock_by_name(trace, clock_name);
+               bt_put(trace_clock);
+               if (trace_clock) {
+                       if (trace_clock != stream_class->clock) {
+                               /*
+                                * Error: two different clocks in the
+                                * trace would share the same name.
+                                */
+                               ret = -1;
+                               goto end;
+                       }
+               } else {
+                       clock_to_add_to_trace = bt_get(stream_class->clock);
+               }
+       }
+
        /*
         * We're about to freeze both the trace and the stream class.
         * Also, each event class contained in this stream class are
@@ -508,7 +541,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
        }
 
        /* Validate each event class individually */
-       for (i = 0; i < event_class_count; ++i) {
+       for (i = 0; i < event_class_count; i++) {
                struct bt_ctf_event_class *event_class =
                        bt_ctf_stream_class_get_event_class(stream_class, i);
                struct bt_ctf_field_type *event_context_type = NULL;
@@ -591,7 +624,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
         */
        bt_ctf_validation_output_put_types(&trace_sc_validation_output);
 
-       for (i = 0; i < event_class_count; ++i) {
+       for (i = 0; i < event_class_count; i++) {
                struct bt_ctf_event_class *event_class =
                        bt_ctf_stream_class_get_event_class(stream_class, i);
 
@@ -615,6 +648,13 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
                trace->byte_order);
        bt_ctf_stream_class_set_byte_order(stream_class, trace->byte_order);
 
+       /* Add stream class's clock if it exists */
+       if (clock_to_add_to_trace) {
+               int add_clock_ret =
+                       bt_ctf_trace_add_clock(trace, clock_to_add_to_trace);
+               assert(add_clock_ret == 0);
+       }
+
        /*
         * Freeze the trace and the stream class.
         */
@@ -626,7 +666,7 @@ end:
                bt_object_set_parent(stream_class, NULL);
 
                if (ec_validation_outputs) {
-                       for (i = 0; i < event_class_count; ++i) {
+                       for (i = 0; i < event_class_count; i++) {
                                bt_ctf_validation_output_put_types(
                                        &ec_validation_outputs[i]);
                        }
@@ -635,6 +675,7 @@ end:
 
        g_free(ec_validation_outputs);
        bt_ctf_validation_output_put_types(&trace_sc_validation_output);
+       BT_PUT(clock_to_add_to_trace);
        assert(!packet_header_type);
        assert(!packet_context_type);
        assert(!event_header_type);
@@ -682,7 +723,7 @@ struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class_by_id(
                goto end;
        }
 
-       for (i = 0; i < trace->stream_classes->len; ++i) {
+       for (i = 0; i < trace->stream_classes->len; i++) {
                struct bt_ctf_stream_class *stream_class_candidate;
 
                stream_class_candidate =
@@ -710,7 +751,7 @@ struct bt_ctf_clock *bt_ctf_trace_get_clock_by_name(
                goto end;
        }
 
-       for (i = 0; i < trace->clocks->len; ++i) {
+       for (i = 0; i < trace->clocks->len; i++) {
                struct bt_ctf_clock *cur_clk =
                        g_ptr_array_index(trace->clocks, i);
                const char *cur_clk_name = bt_ctf_clock_get_name(cur_clk);
@@ -801,7 +842,7 @@ void append_env_metadata(struct bt_ctf_trace *trace,
 
        g_string_append(context->string, "env {\n");
 
-       for (i = 0; i < env_size; ++i) {
+       for (i = 0; i < env_size; i++) {
                struct bt_value *env_field_value_obj = NULL;
                const char *entry_name;
 
@@ -1002,7 +1043,7 @@ int bt_ctf_trace_set_packet_header_type(struct bt_ctf_trace *trace,
 
        /* packet_header_type must be a structure */
        if (bt_ctf_field_type_get_type_id(packet_header_type) !=
-               CTF_TYPE_STRUCT) {
+               BT_CTF_TYPE_ID_STRUCT) {
                ret = -1;
                goto end;
        }
@@ -1014,17 +1055,6 @@ end:
        return ret;
 }
 
-void bt_ctf_trace_get(struct bt_ctf_trace *trace)
-{
-       bt_get(trace);
-}
-
-void bt_ctf_trace_put(struct bt_ctf_trace *trace)
-{
-       bt_put(trace);
-
-}
-
 BT_HIDDEN
 struct bt_ctf_field_type *get_field_type(enum field_type_alias alias)
 {
@@ -1046,8 +1076,18 @@ end:
 static
 void bt_ctf_trace_freeze(struct bt_ctf_trace *trace)
 {
+       int i;
+
        bt_ctf_field_type_freeze(trace->packet_header_type);
        bt_ctf_attributes_freeze(trace->environment);
+
+       for (i = 0; i < trace->clocks->len; i++) {
+               struct bt_ctf_clock *clock =
+                       g_ptr_array_index(trace->clocks, i);
+
+               bt_ctf_clock_freeze(clock);
+       }
+
        trace->frozen = 1;
 }