X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-metadata-copy.c;h=e0d73d87853d778123da6c5275bf1f8b360ff0de;hb=98f26e22c1ccebc5baa4d7edc6ef40246cc5de18;hp=60ef68bcee2395b3f076805179b684681020e65d;hpb=37a93d415ba5a4d839a89157d91496f21c367a96;p=babeltrace.git

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
index 60ef68bc..e0d73d87 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-META-COPY"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <inttypes.h>
 #include <stdint.h>
@@ -46,6 +46,13 @@ int copy_trace_class_content(const bt_trace_class *in_trace_class,
 	BT_COMP_LOGD("Copying content of trace class: in-tc-addr=%p, out-tc-addr=%p",
 			in_trace_class, out_trace_class);
 
+	/*
+	 * Safe to use the same value object because it's frozen at this
+	 * point.
+	 */
+	bt_trace_class_set_user_attributes(out_trace_class,
+		bt_trace_class_borrow_user_attributes_const(in_trace_class));
+
 	/* Use the same stream class ids as in the origin trace class. */
 	bt_trace_class_set_assigns_automatic_stream_class_id(out_trace_class,
 			BT_FALSE);
@@ -81,6 +88,13 @@ int copy_clock_class_content(const bt_clock_class *in_clock_class,
 		}
 	}
 
+	/*
+	 * Safe to use the same value object because it's frozen at this
+	 * point.
+	 */
+	bt_clock_class_set_user_attributes(out_clock_class,
+		bt_clock_class_borrow_user_attributes_const(in_clock_class));
+
 	clock_class_description = bt_clock_class_get_description(in_clock_class);
 
 	if (clock_class_description) {
@@ -204,6 +218,13 @@ int copy_stream_class_content(struct trace_ir_maps *ir_maps,
 
 	}
 
+	/*
+	 * Safe to use the same value object because it's frozen at this
+	 * point.
+	 */
+	bt_stream_class_set_user_attributes(out_stream_class,
+		bt_stream_class_borrow_user_attributes_const(in_stream_class));
+
 	bt_stream_class_set_supports_packets(
 		out_stream_class,
 		bt_stream_class_supports_packets(in_stream_class),
@@ -307,7 +328,6 @@ int copy_stream_class_content(struct trace_ir_maps *ir_maps,
 		}
 	}
 
-	/* Set packet snapshot boolean fields. */
 	BT_COMP_LOGD("Copied content of stream class: in-sc-addr=%p, out-sc-addr=%p",
 			in_stream_class, out_stream_class);
 error:
@@ -345,6 +365,13 @@ int copy_event_class_content(struct trace_ir_maps *ir_maps,
 		}
 	}
 
+	/*
+	 * Safe to use the same value object because it's frozen at this
+	 * point.
+	 */
+	bt_event_class_set_user_attributes(out_event_class,
+		bt_event_class_borrow_user_attributes_const(in_event_class));
+
 	/* Copy event class loglevel. */
 	prop_avail = bt_event_class_get_log_level(in_event_class,
 		&ec_log_level);