X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwrite.c;h=9f4fe61d5dcdb0c9d13e3e517aa580aae5420664;hp=2285e92a2e4dc27e7eb39cead4bed82d49281265;hb=f384901f99784474c5c013dd16b4333d9125dfd5;hpb=f3168545b6b7501165eb94181b205b0d2afb6b19

diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index 2285e92a..9f4fe61d 100644
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -279,37 +279,14 @@ struct bt_ctf_stream *get_writer_stream(
 		struct writer_component *writer_component,
 		struct bt_ctf_packet *packet, struct bt_ctf_stream *stream)
 {
-	struct bt_ctf_stream_class *stream_class = NULL;
-	struct bt_ctf_writer *ctf_writer = NULL;
 	struct bt_ctf_stream *writer_stream = NULL;
 
-	stream_class = bt_ctf_stream_get_class(stream);
-	if (!stream_class) {
+	writer_stream = lookup_stream(writer_component, stream);
+	if (!writer_stream) {
 		fprintf(writer_component->err, "[error] %s in %s:%d\n",
 				__func__, __FILE__, __LINE__);
 		goto error;
 	}
-
-	writer_stream = lookup_stream(writer_component, stream);
-	if (!writer_stream) {
-		struct fs_writer *fs_writer;
-
-		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__);
-			goto error;
-		}
-		ctf_writer = bt_get(fs_writer->writer);
-		writer_stream = insert_new_stream(writer_component, ctf_writer,
-				stream_class, stream);
-		if (!writer_stream) {
-			fprintf(writer_component->err, "[error] %s in %s:%d\n",
-					__func__, __FILE__, __LINE__);
-			goto error;
-		}
-		fs_writer->active_streams++;
-	}
 	bt_get(writer_stream);
 
 	goto end;
@@ -317,8 +294,6 @@ struct bt_ctf_stream *get_writer_stream(
 error:
 	BT_PUT(writer_stream);
 end:
-	bt_put(ctf_writer);
-	bt_put(stream_class);
 	return writer_stream;
 }
 
@@ -338,6 +313,50 @@ enum bt_component_status writer_close(
 	return ret;
 }
 
+BT_HIDDEN
+enum bt_component_status writer_stream_begin(
+		struct writer_component *writer_component,
+		struct bt_ctf_stream *stream)
+{
+	struct bt_ctf_stream_class *stream_class = NULL;
+	struct fs_writer *fs_writer;
+	struct bt_ctf_writer *ctf_writer = NULL;
+	struct bt_ctf_stream *writer_stream = NULL;
+	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+	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;
+	}
+
+	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__);
+		goto error;
+	}
+	ctf_writer = bt_get(fs_writer->writer);
+	writer_stream = insert_new_stream(writer_component, ctf_writer,
+			stream_class, stream);
+	if (!writer_stream) {
+		fprintf(writer_component->err, "[error] %s in %s:%d\n",
+				__func__, __FILE__, __LINE__);
+		goto error;
+	}
+	fs_writer->active_streams++;
+
+	goto end;
+
+error:
+	ret = BT_COMPONENT_STATUS_ERROR;
+end:
+	bt_put(ctf_writer);
+	bt_put(stream_class);
+	return ret;
+}
+
 BT_HIDDEN
 enum bt_component_status writer_stream_end(
 		struct writer_component *writer_component,