From 30480ffea774b704d1890837162d1fdf012babfb Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 19 Jun 2017 18:41:50 -0400 Subject: [PATCH] Fix: add_clock_classes(): do not add existing clock classes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- plugins/lttng-utils/copy.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c index eca81685..52d5b489 100644 --- a/plugins/lttng-utils/copy.c +++ b/plugins/lttng-utils/copy.c @@ -1130,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__, @@ -1137,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) { -- 2.34.1