projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 eca816851018849c0c1fe8d7d7161aba0e67734f..52d5b4899b7b3f63abaa10ba1da4e4963809eb11 100644
(file)
--- 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);
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__,
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;
}
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) {
ret = bt_ctf_trace_add_clock_class(writer_trace, clock_class);
BT_PUT(clock_class);
if (ret != 0) {
This page took
0.024506 seconds
and
4
git commands to generate.