ir: only perform trace freeze if not already frozen

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

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index 94a332d162e4052ff9530baf63e0952d45a9b3af..3fa90aa94782af0cb8a87e980df4f7629a946218 100644 (file)
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -443,6 +443,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
 
        for (i = 0; i < trace->stream_classes->len; i++) {
                if (trace->stream_classes->pdata[i] == stream_class) {
+                       /* Stream already registered to the trace */
                        ret = -1;
                        goto end;
                }
@@ -462,7 +463,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
                        }
                }
 
-               if (_bt_ctf_stream_class_set_id(stream_class,
+               if (bt_ctf_stream_class_set_id_no_check(stream_class,
                        stream_id)) {
                        /* TODO Should retry with a different stream id */
                        ret = -1;
@@ -496,7 +497,9 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
        }
 
        bt_ctf_stream_class_freeze(stream_class);
-       bt_ctf_trace_freeze(trace);
+       if (!trace->frozen) {
+               bt_ctf_trace_freeze(trace);
+       }
 end:
        if (ret) {
                (void) bt_ctf_stream_class_set_trace(stream_class, NULL);