Fix: add_clock_classes(): do not add existing clock classes

[babeltrace.git] / plugins / lttng-utils / copy.c

diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c
index 629d81be4f0d6156bf9b93766b5be77de34905c9..52d5b4899b7b3f63abaa10ba1da4e4963809eb11 100644 (file)
--- a/plugins/lttng-utils/copy.c
+++ b/plugins/lttng-utils/copy.c
@@ -867,15 +867,28 @@ struct bt_ctf_packet *insert_new_packet(struct debug_info_iterator *debug_it,
                struct debug_info_trace *di_trace)
 {
        struct bt_ctf_packet *writer_packet;
+       int ret;
 
        writer_packet = bt_ctf_packet_create(writer_stream);
        if (!writer_packet) {
                fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
                                __FILE__, __LINE__);
-               goto end;
+               goto error;
+       }
+
+       ret = ctf_packet_copy_header(debug_it->err, packet, writer_packet);
+       if (ret) {
+               fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+                               __FILE__, __LINE__);
+               goto error;
        }
-       g_hash_table_insert(di_trace->packet_map, (gpointer) packet, writer_packet);
 
+       g_hash_table_insert(di_trace->packet_map, (gpointer) packet,
+                       writer_packet);
+       goto end;
+
+error:
+       BT_PUT(writer_packet);
 end:
        return writer_packet;
 }
@@ -1032,10 +1045,6 @@ struct bt_ctf_stream_class *copy_stream_class_debug_info(FILE *err,
        int ret_int;
        const char *name = bt_ctf_stream_class_get_name(stream_class);
 
-       if (strlen(name) == 0) {
-               name = NULL;
-       }
-
        writer_stream_class = bt_ctf_stream_class_create_empty(name);
        if (!writer_stream_class) {
                fprintf(err, "[error] %s in %s:%d\n",
@@ -1121,6 +1130,7 @@ int add_clock_classes(FILE *err, struct bt_ctf_trace *writer_trace,
        for (i = 0; i < clock_class_count; i++) {
                struct bt_ctf_clock_class *clock_class =
                        bt_ctf_trace_get_clock_class_by_index(trace, i);
+               struct bt_ctf_clock_class *existing_clock_class = NULL;
 
                if (!clock_class) {
                        fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
@@ -1128,6 +1138,14 @@ int add_clock_classes(FILE *err, struct bt_ctf_trace *writer_trace,
                        goto error;
                }
 
+               existing_clock_class = bt_ctf_trace_get_clock_class_by_name(
+                       writer_trace, bt_ctf_clock_class_get_name(clock_class));
+               bt_put(existing_clock_class);
+               if (existing_clock_class) {
+                       bt_put(clock_class);
+                       continue;
+               }
+
                ret = bt_ctf_trace_add_clock_class(writer_trace, clock_class);
                BT_PUT(clock_class);
                if (ret != 0) {