Fix: ir: make sure "stream_id" attr is always right

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

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index 476d62c363cd958d3ec0b1fa87ef5831007ba043..5abfcc79c7ef197db758c781e6c4180a28b28776 100644 (file)
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -32,6 +32,7 @@
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-writer/functor-internal.h>
 #include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/objects.h>
@@ -43,6 +44,8 @@ static
 void bt_ctf_trace_destroy(struct bt_ctf_ref *ref);
 static
 int init_trace_packet_header(struct bt_ctf_trace *trace);
+static
+void bt_ctf_trace_freeze(struct bt_ctf_trace *trace);
 
 static
 const unsigned int field_type_aliases_alignments[] = {
@@ -184,7 +187,7 @@ int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace,
 {
        int ret = 0;
 
-       if (!trace || trace->frozen || !name || !value ||
+       if (!trace || !name || !value ||
                bt_ctf_validate_identifier(name) ||
                !(bt_object_is_integer(value) || bt_object_is_string(value))) {
                ret = -1;
@@ -196,6 +199,26 @@ int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace,
                goto end;
        }
 
+       if (trace->frozen) {
+               /*
+                * New environment fields may be added to a frozen trace,
+                * but existing fields may not be changed.
+                *
+                * The object passed is frozen like all other attributes.
+                */
+               struct bt_object *attribute =
+                       bt_ctf_attributes_get_field_value_by_name(
+                               trace->environment, name);
+
+               if (attribute) {
+                       BT_OBJECT_PUT(attribute);
+                       ret = -1;
+                       goto end;
+               }
+
+               bt_object_freeze(value);
+       }
+
        ret = bt_ctf_attributes_set_field_value(trace->environment, name,
                value);
 
@@ -214,6 +237,22 @@ int bt_ctf_trace_set_environment_field_string(struct bt_ctf_trace *trace,
                goto end;
        }
 
+       if (trace->frozen) {
+               /*
+                * New environment fields may be added to a frozen trace,
+                * but existing fields may not be changed.
+                */
+               struct bt_object *attribute =
+                       bt_ctf_attributes_get_field_value_by_name(
+                               trace->environment, name);
+
+               if (attribute) {
+                       BT_OBJECT_PUT(attribute);
+                       ret = -1;
+                       goto end;
+               }
+       }
+
        env_value_string_obj = bt_object_string_create_init(value);
 
        if (!env_value_string_obj) {
@@ -221,6 +260,9 @@ int bt_ctf_trace_set_environment_field_string(struct bt_ctf_trace *trace,
                goto end;
        }
 
+       if (trace->frozen) {
+               bt_object_freeze(env_value_string_obj);
+       }
        ret = bt_ctf_trace_set_environment_field(trace, name,
                env_value_string_obj);
 
@@ -241,6 +283,22 @@ int bt_ctf_trace_set_environment_field_integer(struct bt_ctf_trace *trace,
                goto end;
        }
 
+       if (trace->frozen) {
+               /*
+                * New environment fields may be added to a frozen trace,
+                * but existing fields may not be changed.
+                */
+               struct bt_object *attribute =
+                       bt_ctf_attributes_get_field_value_by_name(
+                               trace->environment, name);
+
+               if (attribute) {
+                       BT_OBJECT_PUT(attribute);
+                       ret = -1;
+                       goto end;
+               }
+       }
+
        env_value_integer_obj = bt_object_integer_create_init(value);
        if (!env_value_integer_obj) {
                ret = -1;
@@ -249,7 +307,9 @@ int bt_ctf_trace_set_environment_field_integer(struct bt_ctf_trace *trace,
 
        ret = bt_ctf_trace_set_environment_field(trace, name,
                env_value_integer_obj);
-
+       if (trace->frozen) {
+               bt_object_freeze(env_value_integer_obj);
+       }
 end:
        BT_OBJECT_PUT(env_value_integer_obj);
 
@@ -402,8 +462,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
                        }
                }
 
-               if (_bt_ctf_stream_class_set_id(stream_class,
-                       stream_id)) {
+               if (bt_ctf_stream_class_set_id_no_check(stream_class, stream_id)) {
                        /* TODO Should retry with a different stream id */
                        ret = -1;
                        goto end;
@@ -434,10 +493,9 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
        if (ret) {
                goto end;
        }
-       bt_ctf_stream_class_freeze(stream_class);
-       trace->frozen = 1;
-       bt_ctf_attributes_freeze(trace->environment);
 
+       bt_ctf_stream_class_freeze(stream_class);
+       bt_ctf_trace_freeze(trace);
 end:
        if (ret) {
                (void) bt_ctf_stream_class_set_trace(stream_class, NULL);
@@ -823,6 +881,13 @@ struct bt_ctf_field_type *get_field_type(enum field_type_alias alias)
        return field_type;
 }
 
+static
+void bt_ctf_trace_freeze(struct bt_ctf_trace *trace)
+{
+       bt_ctf_attributes_freeze(trace->environment);
+       trace->frozen = 1;
+}
+
 static
 int init_trace_packet_header(struct bt_ctf_trace *trace)
 {