* SOFTWARE.
*/
-#include <babeltrace/ctf-ir/clock-internal.h>
+#include <babeltrace/ctf-writer/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>
#include <stdlib.h>
#include <inttypes.h>
static
-void bt_ctf_writer_destroy(struct bt_ctf_ref *ref);
-static
-int create_stream_file(struct bt_ctf_writer *writer,
- struct bt_ctf_stream *stream);
-static
-void stream_flush_cb(struct bt_ctf_stream *stream,
- struct bt_ctf_writer *writer);
+void bt_ctf_writer_destroy(struct bt_object *obj);
struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
{
goto error;
}
- bt_ctf_ref_init(&writer->ref_count);
+ bt_object_init(writer, bt_ctf_writer_destroy);
writer->path = g_string_new(path);
if (!writer->path) {
goto error_destroy;
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");
error_destroy:
unlinkat(writer->trace_dir_fd, "metadata", 0);
- bt_ctf_writer_destroy(&writer->ref_count);
- writer = NULL;
+ BT_PUT(writer);
error:
return writer;
}
-void bt_ctf_writer_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_writer_destroy(struct bt_object *obj)
{
struct bt_ctf_writer *writer;
- if (!ref) {
- return;
- }
-
- writer = container_of(ref, struct bt_ctf_writer, ref_count);
+ writer = container_of(obj, struct bt_ctf_writer, base);
bt_ctf_writer_flush_metadata(writer);
if (writer->path) {
g_string_free(writer->path, TRUE);
}
}
- bt_ctf_trace_put(writer->trace);
+ bt_object_release(writer->trace);
g_free(writer);
}
+struct bt_ctf_trace *bt_ctf_writer_get_trace(struct bt_ctf_writer *writer)
+{
+ struct bt_ctf_trace *trace = NULL;
+
+ if (!writer) {
+ goto end;
+ }
+
+ trace = writer->trace;
+ bt_get(trace);
+end:
+ return trace;
+}
+
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;
}
- bt_ctf_stream_set_flush_callback(stream, (flush_func)stream_flush_cb,
- writer);
- writer->frozen = 1;
return stream;
error:
- bt_ctf_stream_put(stream);
- return NULL;
+ BT_PUT(stream);
+ return stream;
}
int bt_ctf_writer_add_environment_field(struct bt_ctf_writer *writer,
goto end;
}
- ret = bt_ctf_trace_add_environment_field(writer->trace,
+ ret = bt_ctf_trace_set_environment_field_string(writer->trace,
name, value);
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)
{
goto end;
}
- ret = bt_ctf_trace_add_clock(writer->trace, clock);
+ ret = bt_ctf_trace_add_clock_class(writer->trace, clock->clock_class);
end:
return ret;
}
void bt_ctf_writer_get(struct bt_ctf_writer *writer)
{
- if (!writer) {
- return;
- }
-
- bt_ctf_ref_get(&writer->ref_count);
+ bt_get(writer);
}
void bt_ctf_writer_put(struct bt_ctf_writer *writer)
{
- if (!writer) {
- return;
- }
-
- bt_ctf_ref_put(&writer->ref_count, bt_ctf_writer_destroy);
-}
-
-static
-int create_stream_file(struct bt_ctf_writer *writer,
- struct bt_ctf_stream *stream)
-{
- int fd;
- GString *filename = g_string_new(stream->stream_class->name->str);
-
- 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);
- g_string_free(filename, TRUE);
- return fd;
+ bt_put(writer);
}
-static
-void stream_flush_cb(struct bt_ctf_stream *stream, struct bt_ctf_writer *writer)
+BT_HIDDEN
+void bt_ctf_writer_freeze(struct bt_ctf_writer *writer)
{
- struct bt_ctf_field *stream_id;
-
- /* Start a new packet in the stream */
- if (stream->flushed_packet_count) {
- /* ctf_init_pos has already initialized the first packet */
- ctf_packet_seek(&stream->pos.parent, 0, SEEK_CUR);
- }
-
- stream_id = bt_ctf_field_structure_get_field(
- writer->trace->trace_packet_header, "stream_id");
- bt_ctf_field_unsigned_integer_set_value(stream_id, stream->stream_class->id);
- bt_ctf_field_put(stream_id);
-
- /* Write the trace_packet_header */
- bt_ctf_field_serialize(writer->trace->trace_packet_header, &stream->pos);
+ writer->frozen = 1;
}
projects / babeltrace.git / blobdiff