X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwrite.c;h=995d344b807d64c37cae0a0f3b6f3dee56d3a4e7;hb=885a8803311f24d33ae0bdd4b0b2adf8cc057a24;hp=d8131d318211a9a029d2144c4c122e0e50a850b7;hpb=6f25f7c4a60d3646fd14741803895a3aad1c4ab1;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index d8131d31..995d344b 100644
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -26,6 +26,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-WRITE"
+#include "logging.h"
+
 #include <babeltrace/ctf-ir/event.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/ctf-ir/event-class.h>
@@ -36,6 +39,7 @@
 #include <babeltrace/ctf-writer/stream-class.h>
 #include <babeltrace/ctf-writer/stream.h>
 #include <assert.h>
+#include <glib.h>
 
 #include <ctfcopytrace.h>
 
@@ -53,16 +57,32 @@ void unref_stream(struct bt_ctf_stream_class *writer_stream)
 	bt_put(writer_stream);
 }
 
+static
 gboolean empty_ht(gpointer key, gpointer value, gpointer user_data)
 {
 	return TRUE;
 }
 
+static
+gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
+{
+	int ret;
+	struct bt_ctf_stream *writer_stream = value;
+
+	ret = bt_ctf_stream_flush(writer_stream);
+	if (ret) {
+		BT_LOGD_STR("Failed to flush stream while emptying hash table.");
+	}
+	return TRUE;
+}
+
+static
 void destroy_stream_state_key(gpointer key)
 {
 	g_free((enum fs_writer_stream_state *) key);
 }
 
+static
 void check_completed_trace(gpointer key, gpointer value, gpointer user_data)
 {
 	enum fs_writer_stream_state *state = value;
@@ -102,36 +122,28 @@ struct bt_ctf_stream_class *insert_new_stream_class(
 	enum bt_component_status ret;
 
 	trace = bt_ctf_stream_class_get_trace(stream_class);
-	if (!trace) {
-		fprintf(writer_component->err,
-				"[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
-	}
+	assert(trace);
 
 	writer_trace = bt_ctf_writer_get_trace(ctf_writer);
-	if (!writer_trace) {
-		fprintf(writer_component->err,
-				"[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
-	}
+	assert(writer_trace);
 
 	ret = ctf_copy_clock_classes(writer_component->err, writer_trace,
 			writer_stream_class, trace);
 	if (ret != BT_COMPONENT_STATUS_OK) {
-		fprintf(writer_component->err,
-				"[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
+		BT_LOGE_STR("Failed to copy clock classes.");
 		goto error;
 	}
 
 	writer_stream_class = ctf_copy_stream_class(writer_component->err,
 			stream_class, writer_trace, true);
 	if (!writer_stream_class) {
-		fprintf(writer_component->err, "[error] Failed to copy stream class\n");
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to copy stream class.");
+		goto error;
+	}
+
+	ret = bt_ctf_trace_add_stream_class(writer_trace, writer_stream_class);
+	if (ret) {
+		BT_LOGE_STR("Failed to add stream_class.");
 		goto error;
 	}
 
@@ -157,17 +169,57 @@ enum fs_writer_stream_state *insert_new_stream_state(
 
 	v = g_new0(enum fs_writer_stream_state, 1);
 	if (!v) {
-		fprintf(writer_component->err,
-				"[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
+		BT_LOGE_STR("Failed to allocate fs_writer_stream_state.");
+		goto end;
 	}
 	*v = FS_WRITER_UNKNOWN_STREAM;
 
 	g_hash_table_insert(fs_writer->stream_states, stream, v);
-
+end:
 	return v;
 }
 
+/*
+ * Make sure the output path is valid for a single trace: either it does
+ * not exists or it is empty.
+ *
+ * Return 0 if the path is valid, -1 otherwise.
+ */
+static
+bool valid_single_trace_path(const char *path)
+{
+	GError *error = NULL;
+	GDir *dir = NULL;
+	int ret = 0;
+
+	dir = g_dir_open(path, 0, &error);
+
+	/* Non-existent directory. */
+	if (!dir) {
+		/* For any other error, return an error */
+		if (error->code != G_FILE_ERROR_NOENT) {
+			ret = -1;
+		}
+		goto end;
+	}
+
+	/* g_dir_read_name skips "." and "..", error out on first result */
+	while (g_dir_read_name(dir) != NULL) {
+		ret = -1;
+		break;
+	}
+
+end:
+	if (dir) {
+		g_dir_close(dir);
+	}
+	if (error) {
+		g_error_free(error);
+	}
+
+	return ret;
+}
+
 static
 int make_trace_path(struct writer_component *writer_component,
 		struct bt_ctf_trace *trace, char *trace_path)
@@ -175,23 +227,23 @@ int make_trace_path(struct writer_component *writer_component,
 	int ret;
 	const char *trace_name;
 
-	trace_name = bt_ctf_trace_get_name(trace);
-	if (!trace_name) {
-		trace_name = writer_component->trace_name_base->str;
+	if (writer_component->single_trace) {
+		trace_name = "\0";
+	} else {
+		trace_name = bt_ctf_trace_get_name(trace);
+		if (!trace_name) {
+			trace_name = writer_component->trace_name_base->str;
+		}
 	}
-	/* XXX: we might have to skip the first level, TBD. */
 
 	/* Sanitize the trace name. */
 	if (strlen(trace_name) == 2 && !strcmp(trace_name, "..")) {
-		fprintf(writer_component->err, "[error] Trace name cannot "
-				"be \"..\"\n");
+		BT_LOGE_STR("Trace name cannot be \"..\".");
 		goto error;
 	}
 
 	if (strstr(trace_name, "../")) {
-		fprintf(writer_component->err, "[error] Trace name cannot "
-				"contain \"../\", received \"%s\"\n",
-				trace_name);
+		BT_LOGE_STR("Trace name cannot contain \"../\".");
 		goto error;
 
 	}
@@ -199,22 +251,32 @@ int make_trace_path(struct writer_component *writer_component,
 	snprintf(trace_path, PATH_MAX, "%s/%s",
 			writer_component->base_path->str,
 			trace_name);
-	if (g_file_test(trace_path, G_FILE_TEST_EXISTS)) {
-		int i = 0;
-		do {
-			snprintf(trace_path, PATH_MAX, "%s/%s-%d",
-					writer_component->base_path->str,
-					trace_name, ++i);
-		} while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX);
-		if (i == INT_MAX) {
-			fprintf(writer_component->err, "[error] Unable to find "
-					"a unique trace path\n");
+	/*
+	 * Append a suffix if the trace_path exists and we are not in
+	 * single-trace mode.
+	 */
+	if (writer_component->single_trace) {
+		if (valid_single_trace_path(trace_path) != 0) {
+			BT_LOGE_STR("Invalid output directory.");
 			goto error;
 		}
+	} else {
+		if (g_file_test(trace_path, G_FILE_TEST_EXISTS)) {
+			int i = 0;
+
+			do {
+				snprintf(trace_path, PATH_MAX, "%s/%s-%d",
+						writer_component->base_path->str,
+						trace_name, ++i);
+			} while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX);
+			if (i == INT_MAX) {
+				BT_LOGE_STR("Unable to find a unique trace path.");
+				goto error;
+			}
+		}
 	}
 
 	ret = 0;
-
 	goto end;
 
 error:
@@ -236,10 +298,14 @@ struct fs_writer *insert_new_writer(
 	struct fs_writer *fs_writer = NULL;
 	int nr_stream, i;
 
+	if (writer_component->single_trace && writer_component->nr_traces > 0) {
+		BT_LOGE_STR("Trying to process more than one trace but single trace mode enabled.");
+		goto error;
+	}
+
 	ret = make_trace_path(writer_component, trace, trace_path);
 	if (ret) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to make trace path.");
 		goto error;
 	}
 
@@ -247,33 +313,23 @@ struct fs_writer *insert_new_writer(
 
 	ctf_writer = bt_ctf_writer_create(trace_path);
 	if (!ctf_writer) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to create CTF writer.");
 		goto error;
 	}
 
 	writer_trace = bt_ctf_writer_get_trace(ctf_writer);
-	if (!writer_trace) {
-		fprintf(writer_component->err,
-				"[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
-		goto error;
-	}
+	assert(writer_trace);
 
 	ret = ctf_copy_trace(writer_component->err, trace, writer_trace);
 	if (ret != BT_COMPONENT_STATUS_OK) {
-		fprintf(writer_component->err, "[error] Failed to copy trace\n");
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to copy trace.");
 		BT_PUT(ctf_writer);
 		goto error;
 	}
 
 	fs_writer = g_new0(struct fs_writer, 1);
 	if (!fs_writer) {
-		fprintf(writer_component->err,
-				"[error] %s in %s:%d\n", __func__, __FILE__,
-				__LINE__);
+		BT_LOGE_STR("Failed to allocate fs_writer.");
 		goto error;
 	}
 	fs_writer->writer = ctf_writer;
@@ -292,12 +348,8 @@ struct fs_writer *insert_new_writer(
 	nr_stream = bt_ctf_trace_get_stream_count(trace);
 	for (i = 0; i < nr_stream; i++) {
 		stream = bt_ctf_trace_get_stream_by_index(trace, i);
-		if (!stream) {
-			fprintf(writer_component->err,
-					"[error] %s in %s:%d\n", __func__,
-					__FILE__, __LINE__);
-			goto error;
-		}
+		assert(stream);
+
 		insert_new_stream_state(writer_component, fs_writer, stream);
 		BT_PUT(stream);
 	}
@@ -309,15 +361,11 @@ struct fs_writer *insert_new_writer(
 	} else {
 		ret = bt_ctf_trace_add_is_static_listener(trace,
 				trace_is_static_listener, fs_writer);
-		if (ret < 0) {
-			fprintf(writer_component->err,
-					"[error] %s in %s:%d\n", __func__, __FILE__,
-					__LINE__);
-			goto error;
-		}
+		assert(ret >= 0);
 		fs_writer->static_listener_id = ret;
 	}
 
+	writer_component->nr_traces++;
 	g_hash_table_insert(writer_component->trace_map, (gpointer) trace,
 			fs_writer);
 
@@ -341,11 +389,7 @@ struct fs_writer *get_fs_writer(struct writer_component *writer_component,
 	struct fs_writer *fs_writer;
 
 	trace = bt_ctf_stream_class_get_trace(stream_class);
-	if (!trace) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	assert(trace);
 
 	fs_writer = g_hash_table_lookup(writer_component->trace_map,
 			(gpointer) trace);
@@ -353,11 +397,7 @@ struct fs_writer *get_fs_writer(struct writer_component *writer_component,
 		fs_writer = insert_new_writer(writer_component, trace);
 	}
 	BT_PUT(trace);
-	goto end;
 
-error:
-	fs_writer = NULL;
-end:
 	return fs_writer;
 }
 
@@ -370,19 +410,10 @@ struct fs_writer *get_fs_writer_from_stream(
 	struct fs_writer *fs_writer;
 
 	stream_class = bt_ctf_stream_get_class(stream);
-	if (!stream_class) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream_class);
 
 	fs_writer = get_fs_writer(writer_component, stream_class);
-	goto end;
-
-error:
-	fs_writer = NULL;
 
-end:
 	bt_put(stream_class);
 	return fs_writer;
 }
@@ -427,20 +458,15 @@ struct bt_ctf_stream *insert_new_stream(
 		writer_stream_class = insert_new_stream_class(
 				writer_component, fs_writer, stream_class);
 		if (!writer_stream_class) {
-			fprintf(writer_component->err, "[error] %s in %s:%d\n",
-					__func__, __FILE__, __LINE__);
+			BT_LOGE_STR("Failed to insert a new stream_class.");
 			goto error;
 		}
 	}
 	bt_get(writer_stream_class);
 
-	writer_stream = bt_ctf_writer_create_stream(ctf_writer,
-			writer_stream_class);
-	if (!writer_stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	writer_stream = bt_ctf_stream_create(writer_stream_class,
+		bt_ctf_stream_get_name(stream));
+	assert(writer_stream);
 
 	g_hash_table_insert(fs_writer->stream_map, (gpointer) stream,
 			writer_stream);
@@ -473,8 +499,7 @@ struct bt_ctf_stream *get_writer_stream(
 
 	writer_stream = lookup_stream(writer_component, stream);
 	if (!writer_stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to find existing stream.");
 		goto error;
 	}
 	bt_get(writer_stream);
@@ -491,7 +516,7 @@ BT_HIDDEN
 void writer_close(struct writer_component *writer_component,
 		struct fs_writer *fs_writer)
 {
-	if (fs_writer->static_listener_id > 0) {
+	if (fs_writer->static_listener_id >= 0) {
 		bt_ctf_trace_remove_is_static_listener(fs_writer->trace,
 				fs_writer->static_listener_id);
 	}
@@ -503,7 +528,7 @@ void writer_close(struct writer_component *writer_component,
 
 	/* Empty the stream HT. */
 	g_hash_table_foreach_remove(fs_writer->stream_map,
-			empty_ht, NULL);
+			empty_streams_ht, NULL);
 	g_hash_table_destroy(fs_writer->stream_map);
 
 	/* Empty the stream state HT. */
@@ -524,16 +549,11 @@ enum bt_component_status writer_stream_begin(
 	enum fs_writer_stream_state *state;
 
 	stream_class = bt_ctf_stream_get_class(stream);
-	if (!stream_class) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream_class);
 
 	fs_writer = get_fs_writer(writer_component, stream_class);
 	if (!fs_writer) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to get fs_writer.");
 		goto error;
 	}
 
@@ -541,16 +561,14 @@ enum bt_component_status writer_stream_begin(
 	state = g_hash_table_lookup(fs_writer->stream_states, stream);
 	if (!state) {
 		if (fs_writer->trace_static) {
-			fprintf(writer_component->err, "[error] Adding a new "
-					"stream on a static trace\n");
+			BT_LOGE_STR("Cannot add new stream on a static trace.");
 			goto error;
 		}
 		state = insert_new_stream_state(writer_component, fs_writer,
 				stream);
 	}
 	if (*state != FS_WRITER_UNKNOWN_STREAM) {
-		fprintf(writer_component->err, "[error] Unexpected stream "
-				"state %d\n", *state);
+		BT_LOGE("Unexpected stream state: state=%d", *state);
 		goto error;
 	}
 	*state = FS_WRITER_ACTIVE_STREAM;
@@ -558,11 +576,9 @@ enum bt_component_status writer_stream_begin(
 	writer_stream = insert_new_stream(writer_component, fs_writer,
 			stream_class, stream);
 	if (!writer_stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to insert new stream.");
 		goto error;
 	}
-	fs_writer->active_streams++;
 
 	goto end;
 
@@ -585,23 +601,17 @@ enum bt_component_status writer_stream_end(
 	enum fs_writer_stream_state *state;
 
 	stream_class = bt_ctf_stream_get_class(stream);
-	if (!stream_class) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream_class);
 
 	fs_writer = get_fs_writer(writer_component, stream_class);
 	if (!fs_writer) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to get fs_writer.");
 		goto error;
 	}
 
 	state = g_hash_table_lookup(fs_writer->stream_states, stream);
 	if (*state != FS_WRITER_ACTIVE_STREAM) {
-		fprintf(writer_component->err, "[error] Unexpected stream "
-				"state %d\n", *state);
+		BT_LOGE("Unexpected stream state: state=%d", *state);
 		goto error;
 	}
 	*state = FS_WRITER_COMPLETED_STREAM;
@@ -636,42 +646,32 @@ enum bt_component_status writer_new_packet(
 		struct bt_ctf_packet *packet)
 {
 	struct bt_ctf_stream *stream = NULL, *writer_stream = NULL;
-	struct bt_ctf_field *writer_packet_context = NULL;
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	int int_ret;
 
 	stream = bt_ctf_packet_get_stream(packet);
-	if (!stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream);
 
 	writer_stream = get_writer_stream(writer_component, packet, stream);
 	if (!writer_stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to get writer_stream.");
 		goto error;
 	}
 	BT_PUT(stream);
 
-	writer_packet_context = ctf_copy_packet_context(writer_component->err,
-			packet, writer_stream);
-	if (!writer_packet_context) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+	int_ret = ctf_stream_copy_packet_context(
+			writer_component->err, packet, writer_stream);
+	if (int_ret < 0) {
+		BT_LOGE_STR("Failed to copy packet_context.");
 		goto error;
 	}
 
-	int_ret = bt_ctf_stream_set_packet_context(writer_stream,
-			writer_packet_context);
-	if (int_ret < 0) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
+	ret = ctf_stream_copy_packet_header(writer_component->err,
+			packet, writer_stream);
+	if (ret != 0) {
+		BT_LOGE_STR("Failed to copy packet_header.");
 		goto error;
 	}
-	BT_PUT(writer_stream);
-	BT_PUT(writer_packet_context);
 
 	goto end;
 
@@ -679,7 +679,6 @@ error:
 	ret = BT_COMPONENT_STATUS_ERROR;
 end:
 	bt_put(writer_stream);
-	bt_put(writer_packet_context);
 	bt_put(stream);
 	return ret;
 }
@@ -693,16 +692,11 @@ enum bt_component_status writer_close_packet(
 	enum bt_component_status ret;
 
 	stream = bt_ctf_packet_get_stream(packet);
-	if (!stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream);
 
 	writer_stream = lookup_stream(writer_component, stream);
 	if (!writer_stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n",
-				__func__, __FILE__, __LINE__);
+		BT_LOGE_STR("Failed to find existing stream.");
 		goto error;
 	}
 	BT_PUT(stream);
@@ -710,11 +704,11 @@ enum bt_component_status writer_close_packet(
 	bt_get(writer_stream);
 
 	ret = bt_ctf_stream_flush(writer_stream);
-	if (ret < 0) {
-		fprintf(writer_component->err,
-				"[error] Failed to flush packet\n");
+	if (ret) {
+		BT_LOGE_STR("Failed to flush stream.");
 		goto error;
 	}
+
 	BT_PUT(writer_stream);
 
 	ret = BT_COMPONENT_STATUS_OK;
@@ -738,48 +732,26 @@ enum bt_component_status writer_output_event(
 	struct bt_ctf_stream *stream = NULL, *writer_stream = NULL;
 	struct bt_ctf_stream_class *stream_class = NULL, *writer_stream_class = NULL;
 	struct bt_ctf_event *writer_event = NULL;
-	const char *event_name;
 	int int_ret;
 
 	event_class = bt_ctf_event_get_class(event);
-	if (!event_class) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		goto error;
-	}
-
-	event_name = bt_ctf_event_class_get_name(event_class);
-	if (!event_name) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		goto error;
-	}
+	assert(event_class);
 
 	stream = bt_ctf_event_get_stream(event);
-	if (!stream) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream);
 
 	writer_stream = lookup_stream(writer_component, stream);
 	if (!writer_stream || !bt_get(writer_stream)) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
+		BT_LOGE_STR("Failed for find existing stream.");
 		goto error;
 	}
 
 	stream_class = bt_ctf_event_class_get_stream_class(event_class);
-	if (!stream_class) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		goto error;
-	}
+	assert(stream_class);
 
 	writer_stream_class = lookup_stream_class(writer_component, stream_class);
 	if (!writer_stream_class || !bt_get(writer_stream_class)) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
+		BT_LOGE_STR("Failed to find existing stream_class.");
 		goto error;
 	}
 
@@ -789,15 +761,14 @@ enum bt_component_status writer_output_event(
 		writer_event_class = ctf_copy_event_class(writer_component->err,
 				event_class);
 		if (!writer_event_class) {
-			fprintf(writer_component->err, "[error] %s in %s:%d\n",
-					__func__, __FILE__, __LINE__);
+			BT_LOGE_STR("Failed to copy event_class.");
 			goto error;
 		}
 		int_ret = bt_ctf_stream_class_add_event_class(
 				writer_stream_class, writer_event_class);
 		if (int_ret) {
-			fprintf(writer_component->err, "[error] %s in %s:%d\n",
-					__func__, __FILE__, __LINE__);
+			BT_LOGE("Failed to add event_class: event_name=\"%s\"",
+					bt_ctf_event_class_get_name(event_class));
 			goto error;
 		}
 	}
@@ -805,18 +776,14 @@ enum bt_component_status writer_output_event(
 	writer_event = ctf_copy_event(writer_component->err, event,
 			writer_event_class, true);
 	if (!writer_event) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		fprintf(writer_component->err, "[error] Failed to copy event %s\n",
+		BT_LOGE("Failed to copy event: event_class=\"%s\"",
 				bt_ctf_event_class_get_name(writer_event_class));
 		goto error;
 	}
 
 	int_ret = bt_ctf_stream_append_event(writer_stream, writer_event);
 	if (int_ret < 0) {
-		fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-				__FILE__, __LINE__);
-		fprintf(writer_component->err, "[error] Failed to append event %s\n",
+		BT_LOGE("Failed to append event: event_class=\"%s\"",
 				bt_ctf_event_class_get_name(writer_event_class));
 		goto error;
 	}