X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fctfcopytrace.c;h=2b408ace8d1765bb73ecdaa4d379a8a71d232e2e;hb=76d2721c40bfaa917047d3f5a7b3d6c7175e90e6;hp=bfd5112946a11ff40aafeeb6e2249b45f716a79b;hpb=279c77d0c8f4acd36f82fbc2c85a410ad5f9a202;p=babeltrace.git

diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c
index bfd51129..2b408ace 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.c
+++ b/plugins/libctfcopytrace/ctfcopytrace.c
@@ -58,7 +58,8 @@ struct bt_ctf_clock_class *ctf_copy_clock_class(FILE *err,
 		goto end;
 	}
 
-	writer_clock_class = bt_ctf_clock_class_create(name);
+	writer_clock_class = bt_ctf_clock_class_create(name,
+		bt_ctf_clock_class_get_frequency(clock_class));
 	if (!writer_clock_class) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
@@ -66,31 +67,14 @@ struct bt_ctf_clock_class *ctf_copy_clock_class(FILE *err,
 	}
 
 	description = bt_ctf_clock_class_get_description(clock_class);
-	if (!description) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto end_destroy;
-	}
-
-	int_ret = bt_ctf_clock_class_set_description(writer_clock_class,
-			description);
-	if (int_ret != 0) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto end_destroy;
-	}
-
-	u64_ret = bt_ctf_clock_class_get_frequency(clock_class);
-	if (u64_ret == -1ULL) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto end_destroy;
-	}
-	int_ret = bt_ctf_clock_class_set_frequency(writer_clock_class, u64_ret);
-	if (int_ret != 0) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto end_destroy;
+	if (description) {
+		int_ret = bt_ctf_clock_class_set_description(writer_clock_class,
+				description);
+		if (int_ret != 0) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+					__LINE__);
+			goto end_destroy;
+		}
 	}
 
 	u64_ret = bt_ctf_clock_class_get_precision(clock_class);
@@ -214,9 +198,12 @@ struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
 		struct bt_ctf_event_class *event_class)
 {
 	struct bt_ctf_event_class *writer_event_class = NULL;
-	struct bt_ctf_field_type *context;
+	struct bt_ctf_field_type *context, *payload_type;
 	const char *name;
-	int count, i, ret;
+	int ret;
+	int64_t id;
+	enum bt_ctf_event_class_log_level log_level;
+	const char *emf_uri;
 
 	name = bt_ctf_event_class_get_name(event_class);
 	if (!name) {
@@ -232,58 +219,55 @@ struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
 		goto end;
 	}
 
-	count = bt_ctf_event_class_get_attribute_count(event_class);
-	for (i = 0; i < count; i++) {
-		const char *attr_name;
-		struct bt_value *attr_value;
-		int ret;
+	id = bt_ctf_event_class_get_id(event_class);
+	if (id < 0) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__,
+				__FILE__, __LINE__);
+		goto error;
+	}
 
-		attr_name = bt_ctf_event_class_get_attribute_name_by_index(
-			event_class, i);
-		if (!attr_name) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
-		attr_value = bt_ctf_event_class_get_attribute_value_by_index(
-			event_class, i);
-		if (!attr_value) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
+	ret = bt_ctf_event_class_set_id(writer_event_class, id);
+	if (ret) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__,
+				__FILE__, __LINE__);
+		goto error;
+	}
 
-		ret = bt_ctf_event_class_set_attribute(writer_event_class,
-				attr_name, attr_value);
-		BT_PUT(attr_value);
-		if (ret < 0) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
+	log_level = bt_ctf_event_class_get_log_level(event_class);
+	if (log_level < 0) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__,
+				__FILE__, __LINE__);
+		goto error;
 	}
 
-	count = bt_ctf_event_class_get_payload_type_field_count(event_class);
-	for (i = 0; i < count; i++) {
-		const char *field_name;
-		struct bt_ctf_field_type *field_type;
-		int ret;
+	ret = bt_ctf_event_class_set_log_level(writer_event_class, log_level);
+	if (ret) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__,
+				__FILE__, __LINE__);
+		goto error;
+	}
 
-		ret = bt_ctf_event_class_get_payload_type_field_by_index(
-				event_class, &field_name, &field_type, i);
-		if (ret < 0) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+	emf_uri = bt_ctf_event_class_get_emf_uri(event_class);
+	if (emf_uri) {
+		ret = bt_ctf_event_class_set_emf_uri(writer_event_class,
+			emf_uri);
+		if (ret) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
 			goto error;
 		}
+	}
 
-		ret = bt_ctf_event_class_add_field(writer_event_class, field_type,
-				field_name);
-		BT_PUT(field_type);
+	payload_type = bt_ctf_event_class_get_payload_type(event_class);
+	if (payload_type) {
+		ret = bt_ctf_event_class_set_payload_type(writer_event_class,
+				payload_type);
 		if (ret < 0) {
-			fprintf(err, "[error] Cannot add field %s\n", field_name);
-			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
 			goto error;
 		}
+		BT_PUT(payload_type);
 	}
 
 	context = bt_ctf_event_class_get_context_type(event_class);
@@ -333,6 +317,22 @@ enum bt_component_status ctf_copy_event_classes(FILE *err,
 			ret = BT_COMPONENT_STATUS_ERROR;
 			goto error;
 		}
+		if (i < bt_ctf_stream_class_get_event_class_count(writer_stream_class)) {
+			writer_event_class = bt_ctf_stream_class_get_event_class_by_index(
+					writer_stream_class, i);
+			if (writer_event_class) {
+				/*
+				 * If the writer_event_class already exists,
+				 * just skip it. It can be used to resync the
+				 * event_classes after a trace has become
+				 * static.
+				 */
+				BT_PUT(writer_event_class);
+				BT_PUT(event_class);
+				continue;
+			}
+		}
+
 		writer_event_class = ctf_copy_event_class(err, event_class);
 		if (!writer_event_class) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__,
@@ -374,11 +374,7 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(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(name);
+	writer_stream_class = bt_ctf_stream_class_create_empty(name);
 	if (!writer_stream_class) {
 		fprintf(err, "[error] %s in %s:%d\n",
 				__func__, __FILE__, __LINE__);
@@ -386,56 +382,54 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
 	}
 
 	type = bt_ctf_stream_class_get_packet_context_type(stream_class);
-	if (!type) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
-	}
-
-	ret_int = bt_ctf_stream_class_set_packet_context_type(
-			writer_stream_class, type);
-	if (ret_int < 0) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
-	}
-	BT_PUT(type);
-
-	type = bt_ctf_stream_class_get_event_header_type(stream_class);
-	if (!type) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
-	}
-
-	if (override_ts64) {
-		struct bt_ctf_field_type *new_event_header_type;
-
-		new_event_header_type = override_header_type(err, type,
-				writer_trace);
-		if (!new_event_header_type) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-					__LINE__);
-			goto error;
-		}
-		ret_int = bt_ctf_stream_class_set_event_header_type(
-				writer_stream_class, new_event_header_type);
-		BT_PUT(new_event_header_type);
+	if (type) {
+		ret_int = bt_ctf_stream_class_set_packet_context_type(
+				writer_stream_class, type);
 		if (ret_int < 0) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-					__LINE__);
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
 			goto error;
 		}
-	} else {
-		ret_int = bt_ctf_stream_class_set_event_header_type(
-				writer_stream_class, type);
+		BT_PUT(type);
+	}
+
+	type = bt_ctf_stream_class_get_event_header_type(stream_class);
+	if (type) {
+		ret_int = bt_ctf_trace_get_clock_class_count(writer_trace);
 		if (ret_int < 0) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-					__LINE__);
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
 			goto error;
 		}
+		if (override_ts64 && ret_int > 0) {
+			struct bt_ctf_field_type *new_event_header_type;
+
+			new_event_header_type = override_header_type(err, type,
+					writer_trace);
+			if (!new_event_header_type) {
+				fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+						__LINE__);
+				goto error;
+			}
+			ret_int = bt_ctf_stream_class_set_event_header_type(
+					writer_stream_class, new_event_header_type);
+			BT_PUT(new_event_header_type);
+			if (ret_int < 0) {
+				fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+						__LINE__);
+				goto error;
+			}
+		} else {
+			ret_int = bt_ctf_stream_class_set_event_header_type(
+					writer_stream_class, type);
+			if (ret_int < 0) {
+				fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+						__LINE__);
+				goto error;
+			}
+		}
+		BT_PUT(type);
 	}
-	BT_PUT(type);
 
 	type = bt_ctf_stream_class_get_event_context_type(stream_class);
 	if (type) {
@@ -459,173 +453,150 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status ctf_copy_packet_context_field(FILE *err,
-		struct bt_ctf_field *field, const char *field_name,
-		struct bt_ctf_field *writer_packet_context,
-		struct bt_ctf_field_type *writer_packet_context_type)
+int ctf_stream_copy_packet_header(FILE *err, struct bt_ctf_packet *packet,
+		struct bt_ctf_stream *writer_stream)
 {
-	enum bt_component_status ret;
-	struct bt_ctf_field *writer_field = NULL;
-	struct bt_ctf_field_type *field_type = NULL;
-	int int_ret;
-	uint64_t value;
+	struct bt_ctf_field *packet_header = NULL, *writer_packet_header = NULL;
+	int ret = 0;
 
-	field_type = bt_ctf_field_get_type(field);
-	if (!field_type) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
+	packet_header = bt_ctf_packet_get_header(packet);
+	if (!packet_header) {
 		goto end;
 	}
-	/*
-	 * Only support for integers for now.
-	 */
-	if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_FIELD_TYPE_ID_INTEGER) {
-		fprintf(err, "[error] Unsupported packet context field type\n");
-		ret = BT_COMPONENT_STATUS_ERROR;
+
+	writer_packet_header = bt_ctf_field_copy(packet_header);
+	if (!writer_packet_header) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+				__LINE__);
 		goto error;
 	}
-	BT_PUT(field_type);
 
-	writer_field = bt_ctf_field_structure_get_field_by_name(
-		writer_packet_context, field_name);
-	if (!writer_field) {
-		ret = BT_COMPONENT_STATUS_ERROR;
+	ret = bt_ctf_stream_set_packet_header(writer_stream,
+			writer_packet_header);
+	if (ret) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
+		goto error;
+	}
+
+	goto end;
+
+error:
+	ret = -1;
+end:
+	bt_put(writer_packet_header);
+	bt_put(packet_header);
+	return ret;
+}
+
+BT_HIDDEN
+int ctf_packet_copy_header(FILE *err, struct bt_ctf_packet *packet,
+		struct bt_ctf_packet *writer_packet)
+{
+	struct bt_ctf_field *packet_header = NULL, *writer_packet_header = NULL;
+	int ret = 0;
+
+	packet_header = bt_ctf_packet_get_header(packet);
+	if (!packet_header) {
 		goto end;
 	}
 
-	int_ret = bt_ctf_field_unsigned_integer_get_value(field, &value);
-	if (int_ret < 0) {
-		fprintf(err, "[error] Wrong packet_context field type\n");
+	writer_packet_header = bt_ctf_field_copy(packet_header);
+	if (!writer_packet_header) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
+		goto error;
 	}
 
-	int_ret = bt_ctf_field_unsigned_integer_set_value(writer_field, value);
-	if (int_ret < 0) {
-		ret = BT_COMPONENT_STATUS_ERROR;
+	ret = bt_ctf_packet_set_header(writer_packet, writer_packet_header);
+	if (ret) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
-		goto end;
+		goto error;
 	}
 
-	ret = BT_COMPONENT_STATUS_OK;
-
 	goto end;
 
 error:
-	bt_put(field_type);
+	ret = -1;
 end:
-	bt_put(writer_field);
+	bt_put(packet_header);
+	bt_put(writer_packet_header);
 	return ret;
 }
 
 BT_HIDDEN
-struct bt_ctf_field *ctf_copy_packet_context(FILE *err,
-		struct bt_ctf_packet *packet,
-		struct bt_ctf_stream *writer_stream,
-		int skip_content_size)
+int ctf_stream_copy_packet_context(FILE *err, struct bt_ctf_packet *packet,
+		struct bt_ctf_stream *writer_stream)
 {
-	enum bt_component_status ret;
 	struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL;
-	struct bt_ctf_field_type *struct_type = NULL, *writer_packet_context_type = NULL;
-	struct bt_ctf_stream_class *writer_stream_class = NULL;
-	struct bt_ctf_field *field = NULL;
-	struct bt_ctf_field_type *field_type = NULL;
-	int nr_fields, i;
+	int ret = 0;
 
 	packet_context = bt_ctf_packet_get_context(packet);
 	if (!packet_context) {
 		goto end;
 	}
 
-	writer_stream_class = bt_ctf_stream_get_class(writer_stream);
-	if (!writer_stream_class) {
+	writer_packet_context = bt_ctf_field_copy(packet_context);
+	if (!writer_packet_context) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
 		goto error;
 	}
 
-	writer_packet_context_type = bt_ctf_stream_class_get_packet_context_type(
-			writer_stream_class);
-	BT_PUT(writer_stream_class);
-	if (!writer_packet_context_type) {
+	ret = bt_ctf_stream_set_packet_context(writer_stream,
+			writer_packet_context);
+	if (ret) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
 		goto error;
 	}
 
-	struct_type = bt_ctf_field_get_type(packet_context);
-	if (!struct_type) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
+	goto end;
+
+error:
+	ret = -1;
+end:
+	bt_put(packet_context);
+	bt_put(writer_packet_context);
+	return ret;
+}
+
+BT_HIDDEN
+int ctf_packet_copy_context(FILE *err, struct bt_ctf_packet *packet,
+		struct bt_ctf_stream *writer_stream,
+		struct bt_ctf_packet *writer_packet)
+{
+	struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL;
+	int ret = 0;
+
+	packet_context = bt_ctf_packet_get_context(packet);
+	if (!packet_context) {
+		goto end;
 	}
 
-	writer_packet_context = bt_ctf_field_create(writer_packet_context_type);
+	writer_packet_context = bt_ctf_field_copy(packet_context);
 	if (!writer_packet_context) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
 		goto error;
 	}
 
-	nr_fields = bt_ctf_field_type_structure_get_field_count(struct_type);
-	for (i = 0; i < nr_fields; i++) {
-		const char *field_name;
-
-		field = bt_ctf_field_structure_get_field_by_index(
-				packet_context, i);
-		if (!field) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
-		if (bt_ctf_field_type_structure_get_field_by_index(struct_type,
-					&field_name, &field_type, i) < 0) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
-		if (skip_content_size &&
-				(!strncmp(field_name, "content_size", strlen("content_size")) ||
-				!strncmp(field_name, "packet_size", strlen("packet_size")))) {
-			BT_PUT(field_type);
-			BT_PUT(field);
-			continue;
-		}
-
-		if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_FIELD_TYPE_ID_INTEGER) {
-			fprintf(err, "[error] Unexpected packet context field type\n");
-			goto error;
-		}
-
-		ret = ctf_copy_packet_context_field(err, field, field_name,
-				writer_packet_context, writer_packet_context_type);
-		BT_PUT(field_type);
-		BT_PUT(field);
-		if (ret != BT_COMPONENT_STATUS_OK) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
+	ret = bt_ctf_packet_set_context(writer_packet, writer_packet_context);
+	if (ret) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+				__LINE__);
+		goto error;
 	}
 
 	goto end;
 
 error:
-	BT_PUT(writer_packet_context);
+	ret = -1;
 end:
-	bt_put(field);
-	bt_put(field_type);
-	bt_put(struct_type);
-	bt_put(writer_packet_context_type);
-	bt_put(writer_stream_class);
+	bt_put(writer_packet_context);
 	bt_put(packet_context);
-	return writer_packet_context;
+	return ret;
 }
 
 BT_HIDDEN
@@ -712,6 +683,36 @@ end:
 	return ret;
 }
 
+static
+struct bt_ctf_trace *event_class_get_trace(FILE *err,
+		struct bt_ctf_event_class *event_class)
+{
+	struct bt_ctf_trace *trace = NULL;
+	struct bt_ctf_stream_class *stream_class = NULL;
+
+	stream_class = bt_ctf_event_class_get_stream_class(event_class);
+	if (!stream_class) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+				__LINE__);
+		goto error;
+	}
+
+	trace = bt_ctf_stream_class_get_trace(stream_class);
+	if (!trace) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+				__LINE__);
+		goto error;
+	}
+
+	goto end;
+
+error:
+	BT_PUT(trace);
+end:
+	bt_put(stream_class);
+	return trace;
+}
+
 BT_HIDDEN
 struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
 		struct bt_ctf_event_class *writer_event_class,
@@ -719,57 +720,73 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
 {
 	struct bt_ctf_event *writer_event = NULL;
 	struct bt_ctf_field *field = NULL, *copy_field = NULL;
+	struct bt_ctf_trace *writer_trace = NULL;
 	int ret;
 
 	writer_event = bt_ctf_event_create(writer_event_class);
 	if (!writer_event) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
 				__LINE__);
-		goto end;
+		goto error;
 	}
 
-	field = bt_ctf_event_get_header(event);
-	if (!field) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
+	writer_trace = event_class_get_trace(err, writer_event_class);
+	if (!writer_trace) {
+		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+				__LINE__);
 		goto error;
 	}
 
-	/*
-	 * If override_ts64, we override all integer fields mapped to a clock
-	 * to a uint64_t field type, otherwise, we just copy it as is.
-	 */
-	if (override_ts64) {
-		copy_field = bt_ctf_event_get_header(writer_event);
-		if (!copy_field) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
-
-		ret = copy_override_field(err, event, writer_event, field,
-				copy_field);
-		if (ret) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
+	field = bt_ctf_event_get_header(event);
+	if (field) {
+		/*
+		 * If override_ts64, we override all integer fields mapped to a
+		 * clock to a uint64_t field type, otherwise, we just copy it as
+		 * is.
+		 */
+		ret = bt_ctf_trace_get_clock_class_count(writer_trace);
+		if (ret < 0) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+					__LINE__);
 			goto error;
 		}
-		BT_PUT(copy_field);
-	} else {
-		ret = ctf_copy_event_header(err, event, writer_event_class,
-				writer_event, field);
-		if (ret) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
+		if (override_ts64 && ret > 0) {
+			copy_field = bt_ctf_event_get_header(writer_event);
+			if (!copy_field) {
+				fprintf(err, "[error] %s in %s:%d\n", __func__,
+						__FILE__, __LINE__);
+				goto error;
+			}
+
+			ret = copy_override_field(err, event, writer_event, field,
+					copy_field);
+			if (ret) {
+				fprintf(err, "[error] %s in %s:%d\n", __func__,
+						__FILE__, __LINE__);
+				goto error;
+			}
+			BT_PUT(copy_field);
+		} else {
+			ret = ctf_copy_event_header(err, event, writer_event_class,
+					writer_event, field);
+			if (ret) {
+				fprintf(err, "[error] %s in %s:%d\n", __func__,
+						__FILE__, __LINE__);
+				goto error;
+			}
 		}
+		BT_PUT(field);
 	}
-	BT_PUT(field);
 
 	/* Optional field, so it can fail silently. */
 	field = bt_ctf_event_get_stream_event_context(event);
-	copy_field = bt_ctf_field_copy(field);
-	if (copy_field) {
+	if (field) {
+		copy_field = bt_ctf_field_copy(field);
+		if (!copy_field) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
+			goto error;
+		}
 		ret = bt_ctf_event_set_stream_event_context(writer_event,
 				copy_field);
 		if (ret < 0) {
@@ -777,41 +794,46 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
 					__FILE__, __LINE__);
 			goto error;
 		}
+		BT_PUT(field);
+		BT_PUT(copy_field);
 	}
-	BT_PUT(field);
-	BT_PUT(copy_field);
 
 	/* Optional field, so it can fail silently. */
 	field = bt_ctf_event_get_event_context(event);
-	copy_field = bt_ctf_field_copy(field);
-	if (copy_field) {
+	if (field) {
+		copy_field = bt_ctf_field_copy(field);
+		if (!copy_field) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
+			goto error;
+		}
 		ret = bt_ctf_event_set_event_context(writer_event, copy_field);
 		if (ret < 0) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__,
 					__FILE__, __LINE__);
 			goto error;
 		}
+		BT_PUT(field);
+		BT_PUT(copy_field);
 	}
-	BT_PUT(field);
-	BT_PUT(copy_field);
 
 	field = bt_ctf_event_get_event_payload(event);
-	if (!field) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		goto error;
-	}
-	copy_field = bt_ctf_field_copy(field);
-	if (copy_field) {
+	if (field) {
+		copy_field = bt_ctf_field_copy(field);
+		if (!copy_field) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__,
+					__FILE__, __LINE__);
+			goto error;
+		}
 		ret = bt_ctf_event_set_event_payload(writer_event, copy_field);
 		if (ret < 0) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__,
 					__FILE__, __LINE__);
 			goto error;
 		}
+		BT_PUT(field);
+		BT_PUT(copy_field);
 	}
-	BT_PUT(field);
-	BT_PUT(copy_field);
 
 	goto end;
 
@@ -820,6 +842,7 @@ error:
 end:
 	bt_put(field);
 	bt_put(copy_field);
+	bt_put(writer_trace);
 	return writer_event;
 }
 
@@ -831,6 +854,8 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
 	int field_count, i, int_ret;
 	struct bt_ctf_field_type *header_type = NULL;
 	enum bt_ctf_byte_order order;
+	const char *trace_name;
+	const unsigned char *trace_uuid;
 
 	field_count = bt_ctf_trace_get_environment_field_count(trace);
 	for (i = 0; i < field_count; i++) {
@@ -881,7 +906,7 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
 	 * the CTF writer object chooses, which is the machine's native
 	 * byte order.
 	 */
-	if (order != BT_CTF_BYTE_ORDER_NONE) {
+	if (order != BT_CTF_BYTE_ORDER_UNSPECIFIED) {
 		ret = bt_ctf_trace_set_native_byte_order(writer_trace, order);
 		if (ret) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
@@ -890,7 +915,7 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
 		}
 	}
 
-	header_type = bt_ctf_trace_get_packet_header_type(writer_trace);
+	header_type = bt_ctf_trace_get_packet_header_type(trace);
 	if (header_type) {
 		int_ret = bt_ctf_trace_set_packet_header_type(writer_trace, header_type);
 		BT_PUT(header_type);
@@ -901,6 +926,26 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
 		}
 	}
 
+	trace_name = bt_ctf_trace_get_name(trace);
+	if (trace_name) {
+		int_ret = bt_ctf_trace_set_name(writer_trace, trace_name);
+		if (int_ret < 0) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+			ret = BT_COMPONENT_STATUS_ERROR;
+			goto end;
+		}
+	}
+
+	trace_uuid = bt_ctf_trace_get_uuid(trace);
+	if (trace_uuid) {
+		int_ret = bt_ctf_trace_set_uuid(writer_trace, trace_uuid);
+		if (int_ret < 0) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+			ret = BT_COMPONENT_STATUS_ERROR;
+			goto end;
+		}
+	}
+
 end:
 	return ret;
 }