X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fctfcopytrace.c;h=5c78d6f8c968b89f7ed665e8d77eef620200c48e;hb=e49da5dd565a2c13516a44dc02382024eba9c8c2;hp=b8e281355b05abc44d798b8c337586719f28127e;hpb=cb0a5cf8ba46a41be5a6d65ed8b9180e92196b75;p=babeltrace.git

diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c
index b8e28135..5c78d6f8 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.c
+++ b/plugins/libctfcopytrace/ctfcopytrace.c
@@ -212,7 +212,10 @@ struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
 	struct bt_ctf_event_class *writer_event_class = NULL;
 	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) {
@@ -228,31 +231,39 @@ 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) {
+	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;
@@ -379,7 +390,7 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
 		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__);
@@ -761,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) {
@@ -770,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;
 
@@ -875,7 +896,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__);