X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fwriter%2Fwriter.c;h=012b3ef04acfc88c2ab7f34f8cc95d363ae7da0f;hb=d7503815516dc78258eb0a6d7ffd2aa9e83caadd;hp=f8a36778e39b3f1382cea2fc66bedc09f483ae1f;hpb=83509119a945fc77faff869daaf48627e1c4b3fa;p=babeltrace.git

diff --git a/formats/ctf/writer/writer.c b/formats/ctf/writer/writer.c
index f8a36778..012b3ef0 100644
--- a/formats/ctf/writer/writer.c
+++ b/formats/ctf/writer/writer.c
@@ -28,11 +28,12 @@
 
 #include <babeltrace/ctf-ir/clock-internal.h>
 #include <babeltrace/ctf-writer/writer-internal.h>
-#include <babeltrace/ctf-ir/event-types-internal.h>
-#include <babeltrace/ctf-ir/event-fields-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/ctf-writer/functor-internal.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
+#include <babeltrace/ctf-ir/trace-internal.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/compiler.h>
 #include <stdio.h>
@@ -46,10 +47,6 @@
 static
 void bt_ctf_writer_destroy(struct bt_object *obj);
 
-static
-int create_stream_file(struct bt_ctf_writer *writer,
-		struct bt_ctf_stream *stream);
-
 struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
 {
 	struct bt_ctf_writer *writer = NULL;
@@ -74,6 +71,9 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
 		goto error_destroy;
 	}
 
+	writer->trace->is_created_by_writer = 1;
+	bt_object_set_parent(writer->trace, writer);
+	bt_put(writer->trace);
 	/* Create trace directory if necessary and open a metadata file */
 	if (g_mkdir_with_parents(path, S_IRWXU | S_IRWXG)) {
 		perror("g_mkdir_with_parents");
@@ -121,7 +121,7 @@ void bt_ctf_writer_destroy(struct bt_object *obj)
 		}
 	}
 
-	bt_put(writer->trace);
+	bt_object_release(writer->trace);
 	g_free(writer);
 }
 
@@ -142,24 +142,50 @@ end:
 struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
 		struct bt_ctf_stream_class *stream_class)
 {
-	int stream_fd;
 	struct bt_ctf_stream *stream = NULL;
+	int stream_class_count;
+	bool stream_class_found = false;
+	int i;
 
 	if (!writer || !stream_class) {
 		goto error;
 	}
 
-	stream = bt_ctf_trace_create_stream(writer->trace, stream_class);
-	if (!stream) {
+	/* Make sure the stream class is part of the writer's trace */
+	stream_class_count = bt_ctf_trace_get_stream_class_count(writer->trace);
+	if (stream_class_count < 0) {
 		goto error;
 	}
 
-	stream_fd = create_stream_file(writer, stream);
-	if (stream_fd < 0 || bt_ctf_stream_set_fd(stream, stream_fd)) {
+	for (i = 0; i < stream_class_count; i++) {
+		struct bt_ctf_stream_class *existing_stream_class =
+			bt_ctf_trace_get_stream_class(writer->trace, i);
+
+		if (existing_stream_class == stream_class) {
+			stream_class_found = true;
+		}
+
+		BT_PUT(existing_stream_class);
+
+		if (stream_class_found) {
+			break;
+		}
+	}
+
+	if (!stream_class_found) {
+		int ret = bt_ctf_trace_add_stream_class(writer->trace,
+			stream_class);
+
+		if (ret) {
+			goto error;
+		}
+	}
+
+	stream = bt_ctf_stream_create(stream_class, NULL);
+	if (!stream) {
 		goto error;
 	}
 
-	writer->frozen = 1;
 	return stream;
 
 error:
@@ -183,6 +209,22 @@ end:
 	return ret;
 }
 
+int bt_ctf_writer_add_environment_field_int64(struct bt_ctf_writer *writer,
+		const char *name,
+		int64_t value)
+{
+	int ret = -1;
+
+	if (!writer || !name) {
+		goto end;
+	}
+
+	ret = bt_ctf_trace_set_environment_field_integer(writer->trace, name,
+		value);
+end:
+	return ret;
+}
+
 int bt_ctf_writer_add_clock(struct bt_ctf_writer *writer,
 		struct bt_ctf_clock *clock)
 {
@@ -272,30 +314,8 @@ void bt_ctf_writer_put(struct bt_ctf_writer *writer)
 	bt_put(writer);
 }
 
-static
-int create_stream_file(struct bt_ctf_writer *writer,
-		struct bt_ctf_stream *stream)
+BT_HIDDEN
+void bt_ctf_writer_freeze(struct bt_ctf_writer *writer)
 {
-	int fd;
-	GString *filename = g_string_new(stream->stream_class->name->str);
-
-	if (stream->stream_class->name->len == 0) {
-		int64_t ret;
-
-		ret = bt_ctf_stream_class_get_id(stream->stream_class);
-		if (ret < 0) {
-			fd = -1;
-			goto error;
-		}
-
-		g_string_printf(filename, "stream_%" PRId64, ret);
-	}
-
-	g_string_append_printf(filename, "_%" PRIu32, stream->id);
-	fd = openat(writer->trace_dir_fd, filename->str,
-		O_RDWR | O_CREAT | O_TRUNC,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-error:
-	g_string_free(filename, TRUE);
-	return fd;
+	writer->frozen = 1;
 }