X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fctfcopytrace.c;h=22f2785e285db5bddf7da999b2811c68f428d0c7;hb=cf76ce92f8f8ae74ec9e1305e8ef83ac1bc4fb26;hp=4455dfb87132ce4705732c167cba2c9ac869cce6;hpb=60ef553bd85cc73dbb3b935fc82ad0d870c9d4ca;p=babeltrace.git

diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c
index 4455dfb8..22f2785e 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.c
+++ b/plugins/libctfcopytrace/ctfcopytrace.c
@@ -66,18 +66,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;
+	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_frequency(clock_class);
@@ -214,8 +210,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, *payload_type;
 	const char *name;
-	int count, i;
+	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) {
@@ -231,56 +231,65 @@ 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) {
+	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;
+	}
+
+	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;
+	}
+
+	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;
+	}
+
+	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_set_attribute(writer_event_class,
-				attr_name, attr_value);
-		BT_PUT(attr_value);
+	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] %s in %s:%d\n", __func__,
 					__FILE__, __LINE__);
 			goto error;
 		}
+		BT_PUT(payload_type);
 	}
 
-	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_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__);
-			goto error;
-		}
-
-		ret = bt_ctf_event_class_add_field(writer_event_class, field_type,
-				field_name);
-		BT_PUT(field_type);
+	context = bt_ctf_event_class_get_context_type(event_class);
+	if (context) {
+		ret = bt_ctf_event_class_set_context_type(
+				writer_event_class, context);
+		BT_PUT(context);
 		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;
 		}
 	}
@@ -310,7 +319,6 @@ enum bt_component_status ctf_copy_event_classes(FILE *err,
 	}
 
 	for (i = 0; i < count; i++) {
-		struct bt_ctf_field_type *context;
 		int int_ret;
 
 		event_class = bt_ctf_stream_class_get_event_class_by_index(
@@ -321,28 +329,29 @@ enum bt_component_status ctf_copy_event_classes(FILE *err,
 			ret = BT_COMPONENT_STATUS_ERROR;
 			goto error;
 		}
-		writer_event_class = ctf_copy_event_class(err, event_class);
-		if (!writer_event_class) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			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;
+			}
 		}
 
-		context = bt_ctf_event_class_get_context_type(event_class);
-		if (!context) {
+		writer_event_class = ctf_copy_event_class(err, event_class);
+		if (!writer_event_class) {
 			fprintf(err, "[error] %s in %s:%d\n", __func__,
 					__FILE__, __LINE__);
 			ret = BT_COMPONENT_STATUS_ERROR;
 			goto error;
 		}
-		ret = bt_ctf_event_class_set_context_type(writer_event_class, context);
-		BT_PUT(context);
-		if (ret < 0) {
-			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-					__LINE__);
-			goto error;
-		}
 
 		int_ret = bt_ctf_stream_class_add_event_class(writer_stream_class,
 				writer_event_class);
@@ -537,7 +546,7 @@ struct bt_ctf_field *ctf_copy_packet_context(FILE *err,
 	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;
+	struct bt_ctf_field_type *field_type = NULL;
 	int nr_fields, i;
 
 	packet_context = bt_ctf_packet_get_context(packet);
@@ -592,13 +601,6 @@ struct bt_ctf_field *ctf_copy_packet_context(FILE *err,
 					__FILE__, __LINE__);
 			goto error;
 		}
-		if (!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");
@@ -770,8 +772,13 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
 
 	/* 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) {
@@ -779,41 +786,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;
 
@@ -832,6 +844,8 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	int field_count, i, int_ret;
 	struct bt_ctf_field_type *header_type = NULL;
+	enum bt_ctf_byte_order order;
+	const char *trace_name;
 
 	field_count = bt_ctf_trace_get_environment_field_count(trace);
 	for (i = 0; i < field_count; i++) {
@@ -869,19 +883,47 @@ 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);
-	if (!header_type) {
+	order = bt_ctf_trace_get_native_byte_order(trace);
+	if (order == BT_CTF_BYTE_ORDER_UNKNOWN) {
 		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
 
-	int_ret = bt_ctf_trace_set_packet_header_type(writer_trace, header_type);
-	BT_PUT(header_type);
-	if (int_ret < 0) {
-		fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
+	/*
+	 * Only explicitly set the writer trace's native byte order if
+	 * the original trace has a specific one. Otherwise leave what
+	 * the CTF writer object chooses, which is the machine's native
+	 * byte order.
+	 */
+	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__);
+			ret = BT_COMPONENT_STATUS_ERROR;
+			goto end;
+		}
+	}
+
+	header_type = bt_ctf_trace_get_packet_header_type(writer_trace);
+	if (header_type) {
+		int_ret = bt_ctf_trace_set_packet_header_type(writer_trace, header_type);
+		BT_PUT(header_type);
+		if (int_ret < 0) {
+			fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+			ret = BT_COMPONENT_STATUS_ERROR;
+			goto end;
+		}
+	}
+
+	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;
+		}
 	}
 
 end: