Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[babeltrace.git] / lib / ctf-writer / writer.c

diff --git a/lib/ctf-writer/writer.c b/lib/ctf-writer/writer.c
index 2978cdfb78a02affa2f7b0e32193eb44225d10cd..ce884ea6d56e9c1e7d8a1e8708c68f8abb0c59bd 100644 (file)
--- a/lib/ctf-writer/writer.c
+++ b/lib/ctf-writer/writer.c
@@ -53,43 +53,43 @@ static
 void bt_ctf_writer_destroy(struct bt_object *obj);
 
 static
-int init_trace_packet_header(struct bt_ctf_trace *trace)
+int init_trace_packet_header(struct bt_trace *trace)
 {
        int ret = 0;
-       struct bt_ctf_field *magic = NULL, *uuid_array = NULL;
-       struct bt_ctf_field_type *_uint32_t =
+       struct bt_field *magic = NULL, *uuid_array = NULL;
+       struct bt_field_type *_uint32_t =
                get_field_type(FIELD_TYPE_ALIAS_UINT32_T);
-       struct bt_ctf_field_type *_uint8_t =
+       struct bt_field_type *_uint8_t =
                get_field_type(FIELD_TYPE_ALIAS_UINT8_T);
-       struct bt_ctf_field_type *trace_packet_header_type =
-               bt_ctf_field_type_structure_create();
-       struct bt_ctf_field_type *uuid_array_type =
-               bt_ctf_field_type_array_create(_uint8_t, 16);
+       struct bt_field_type *trace_packet_header_type =
+               bt_field_type_structure_create();
+       struct bt_field_type *uuid_array_type =
+               bt_field_type_array_create(_uint8_t, 16);
 
        if (!trace_packet_header_type || !uuid_array_type) {
                ret = -1;
                goto end;
        }
 
-       ret = bt_ctf_field_type_structure_add_field(trace_packet_header_type,
+       ret = bt_field_type_structure_add_field(trace_packet_header_type,
                _uint32_t, "magic");
        if (ret) {
                goto end;
        }
 
-       ret = bt_ctf_field_type_structure_add_field(trace_packet_header_type,
+       ret = bt_field_type_structure_add_field(trace_packet_header_type,
                uuid_array_type, "uuid");
        if (ret) {
                goto end;
        }
 
-       ret = bt_ctf_field_type_structure_add_field(trace_packet_header_type,
+       ret = bt_field_type_structure_add_field(trace_packet_header_type,
                _uint32_t, "stream_id");
        if (ret) {
                goto end;
        }
 
-       ret = bt_ctf_trace_set_packet_header_type(trace,
+       ret = bt_trace_set_packet_header_type(trace,
                trace_packet_header_type);
        if (ret) {
                goto end;
@@ -128,7 +128,7 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
                goto error_destroy;
        }
 
-       writer->trace = bt_ctf_trace_create();
+       writer->trace = bt_trace_create();
        if (!writer->trace) {
                goto error_destroy;
        }
@@ -145,7 +145,7 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
                goto error_destroy;
        }
 
-       ret = bt_ctf_trace_set_uuid(writer->trace, uuid);
+       ret = bt_trace_set_uuid(writer->trace, uuid);
        if (ret) {
                goto error_destroy;
        }
@@ -155,7 +155,7 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
        bt_put(writer->trace);
 
        /* Default to little-endian */
-       ret = bt_ctf_writer_set_byte_order(writer, BT_CTF_BYTE_ORDER_NATIVE);
+       ret = bt_ctf_writer_set_byte_order(writer, BT_BYTE_ORDER_NATIVE);
        assert(ret == 0);
 
        /* Create trace directory if necessary and open a metadata file */
@@ -202,9 +202,9 @@ void bt_ctf_writer_destroy(struct bt_object *obj)
        g_free(writer);
 }
 
-struct bt_ctf_trace *bt_ctf_writer_get_trace(struct bt_ctf_writer *writer)
+struct bt_trace *bt_ctf_writer_get_trace(struct bt_ctf_writer *writer)
 {
-       struct bt_ctf_trace *trace = NULL;
+       struct bt_trace *trace = NULL;
 
        if (!writer) {
                goto end;
@@ -216,10 +216,10 @@ end:
        return trace;
 }
 
-struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
-               struct bt_ctf_stream_class *stream_class)
+struct bt_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
+               struct bt_stream_class *stream_class)
 {
-       struct bt_ctf_stream *stream = NULL;
+       struct bt_stream *stream = NULL;
        int stream_class_count;
        bt_bool stream_class_found = BT_FALSE;
        int i;
@@ -229,14 +229,14 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
        }
 
        /* Make sure the stream class is part of the writer's trace */
-       stream_class_count = bt_ctf_trace_get_stream_class_count(writer->trace);
+       stream_class_count = bt_trace_get_stream_class_count(writer->trace);
        if (stream_class_count < 0) {
                goto error;
        }
 
        for (i = 0; i < stream_class_count; i++) {
-               struct bt_ctf_stream_class *existing_stream_class =
-                       bt_ctf_trace_get_stream_class_by_index(
+               struct bt_stream_class *existing_stream_class =
+                       bt_trace_get_stream_class_by_index(
                                writer->trace, i);
 
                if (existing_stream_class == stream_class) {
@@ -251,7 +251,7 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
        }
 
        if (!stream_class_found) {
-               int ret = bt_ctf_trace_add_stream_class(writer->trace,
+               int ret = bt_trace_add_stream_class(writer->trace,
                        stream_class);
 
                if (ret) {
@@ -259,7 +259,7 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
                }
        }
 
-       stream = bt_ctf_stream_create(stream_class, NULL);
+       stream = bt_stream_create(stream_class, NULL);
        if (!stream) {
                goto error;
        }
@@ -281,7 +281,7 @@ int bt_ctf_writer_add_environment_field(struct bt_ctf_writer *writer,
                goto end;
        }
 
-       ret = bt_ctf_trace_set_environment_field_string(writer->trace,
+       ret = bt_trace_set_environment_field_string(writer->trace,
                name, value);
 end:
        return ret;
@@ -296,7 +296,7 @@ int bt_ctf_writer_add_environment_field_int64(struct bt_ctf_writer *writer,
                goto end;
        }
 
-       ret = bt_ctf_trace_set_environment_field_integer(writer->trace, name,
+       ret = bt_trace_set_environment_field_integer(writer->trace, name,
                value);
 end:
        return ret;
@@ -311,7 +311,7 @@ int bt_ctf_writer_add_clock(struct bt_ctf_writer *writer,
                goto end;
        }
 
-       ret = bt_ctf_trace_add_clock_class(writer->trace, clock->clock_class);
+       ret = bt_trace_add_clock_class(writer->trace, clock->clock_class);
 end:
        return ret;
 }
@@ -324,7 +324,7 @@ char *bt_ctf_writer_get_metadata_string(struct bt_ctf_writer *writer)
                goto end;
        }
 
-       metadata_string = bt_ctf_trace_get_metadata_string(
+       metadata_string = bt_trace_get_metadata_string(
                writer->trace);
 end:
        return metadata_string;
@@ -339,7 +339,7 @@ void bt_ctf_writer_flush_metadata(struct bt_ctf_writer *writer)
                goto end;
        }
 
-       metadata_string = bt_ctf_trace_get_metadata_string(
+       metadata_string = bt_trace_get_metadata_string(
                writer->trace);
        if (!metadata_string) {
                goto end;
@@ -366,7 +366,7 @@ end:
 }
 
 int bt_ctf_writer_set_byte_order(struct bt_ctf_writer *writer,
-               enum bt_ctf_byte_order byte_order)
+               enum bt_byte_order byte_order)
 {
        int ret = 0;
 
@@ -375,11 +375,11 @@ int bt_ctf_writer_set_byte_order(struct bt_ctf_writer *writer,
                goto end;
        }
 
-       if (byte_order == BT_CTF_BYTE_ORDER_NATIVE) {
-               byte_order = BT_CTF_MY_BYTE_ORDER;
+       if (byte_order == BT_BYTE_ORDER_NATIVE) {
+               byte_order = BT_MY_BYTE_ORDER;
        }
 
-       ret = bt_ctf_trace_set_native_byte_order(writer->trace,
+       ret = bt_trace_set_native_byte_order(writer->trace,
                byte_order);
 end:
        return ret;