From 1dd85641ad9c09e057155b47c772279c4fda48d8 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Wed, 17 Apr 2019 16:07:46 -0400 Subject: [PATCH] flt.lttng-utils.debug-info: Don't copy trace class UUID to output trace class A `flt.lttng-utils.debug-info` component creates an output trace class that may be different that of the input trace class, so the UUID should not be copied. In fact, we don't need a UUID at this point. the sink component can decide to add one later. Signed-off-by: Francis Deslauriers --- plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c index 5655e62d..7e9b81e2 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c +++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c @@ -43,7 +43,6 @@ int copy_trace_class_content(const bt_trace_class *in_trace_class, int ret = 0; uint64_t i, env_field_count; const char *in_trace_class_name; - bt_uuid in_uuid; BT_LOGD("Copying content of trace class: in-tc-addr=%p, out-tc-addr=%p", in_trace_class, out_trace_class); @@ -57,10 +56,10 @@ int copy_trace_class_content(const bt_trace_class *in_trace_class, bt_trace_class_set_name(out_trace_class, in_trace_class_name); } - in_uuid = bt_trace_class_get_uuid(in_trace_class); - if (in_uuid) { - bt_trace_class_set_uuid(out_trace_class, in_uuid); - } + /* + * Do not copy the trace class UUID as it may be modified and should no + * longer have the same UUID. + */ /* * Go over all the entries in the environment section of the trace class -- 2.34.1