Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer
[babeltrace.git] / plugins / libctfcopytrace / ctfcopytrace.c
index 6debd71ced1901ec0da6a7db56a8c99f384d164e..156c486816cddc32306ca8bd0fa83b32cdb0c21b 100644 (file)
 #include "clock-fields.h"
 
 BT_HIDDEN
-struct bt_ctf_clock_class *ctf_copy_clock_class(FILE *err,
-               struct bt_ctf_clock_class *clock_class)
+struct bt_clock_class *ctf_copy_clock_class(FILE *err,
+               struct bt_clock_class *clock_class)
 {
        int64_t offset, offset_s;
        int int_ret;
        uint64_t u64_ret;
        const char *name, *description;
-       struct bt_ctf_clock_class *writer_clock_class = NULL;
+       struct bt_clock_class *writer_clock_class = NULL;
 
        assert(err && clock_class);
 
-       name = bt_ctf_clock_class_get_name(clock_class);
+       name = bt_clock_class_get_name(clock_class);
        assert(name);
 
-       writer_clock_class = bt_ctf_clock_class_create(name,
-               bt_ctf_clock_class_get_frequency(clock_class));
+       writer_clock_class = bt_clock_class_create(name,
+               bt_clock_class_get_frequency(clock_class));
        if (!writer_clock_class) {
                BT_LOGE_STR("Failed to create clock class.");
                goto end;
        }
 
-       description = bt_ctf_clock_class_get_description(clock_class);
+       description = bt_clock_class_get_description(clock_class);
        if (description) {
-               int_ret = bt_ctf_clock_class_set_description(writer_clock_class,
+               int_ret = bt_clock_class_set_description(writer_clock_class,
                                description);
                assert(!int_ret);
        }
 
-       u64_ret = bt_ctf_clock_class_get_precision(clock_class);
+       u64_ret = bt_clock_class_get_precision(clock_class);
        assert(u64_ret != -1ULL);
 
-       int_ret = bt_ctf_clock_class_set_precision(writer_clock_class,
+       int_ret = bt_clock_class_set_precision(writer_clock_class,
                u64_ret);
        assert(!int_ret);
 
-       int_ret = bt_ctf_clock_class_get_offset_s(clock_class, &offset_s);
+       int_ret = bt_clock_class_get_offset_s(clock_class, &offset_s);
        assert(!int_ret);
 
-       int_ret = bt_ctf_clock_class_set_offset_s(writer_clock_class, offset_s);
+       int_ret = bt_clock_class_set_offset_s(writer_clock_class, offset_s);
        assert(!int_ret);
 
-       int_ret = bt_ctf_clock_class_get_offset_cycles(clock_class, &offset);
+       int_ret = bt_clock_class_get_offset_cycles(clock_class, &offset);
        assert(!int_ret);
 
-       int_ret = bt_ctf_clock_class_set_offset_cycles(writer_clock_class, offset);
+       int_ret = bt_clock_class_set_offset_cycles(writer_clock_class, offset);
        assert(!int_ret);
 
-       int_ret = bt_ctf_clock_class_is_absolute(clock_class);
+       int_ret = bt_clock_class_is_absolute(clock_class);
        assert(int_ret >= 0);
 
-       int_ret = bt_ctf_clock_class_set_is_absolute(writer_clock_class, int_ret);
+       int_ret = bt_clock_class_set_is_absolute(writer_clock_class, int_ret);
        assert(!int_ret);
 
 end:
@@ -95,19 +95,19 @@ end:
 
 BT_HIDDEN
 enum bt_component_status ctf_copy_clock_classes(FILE *err,
-               struct bt_ctf_trace *writer_trace,
-               struct bt_ctf_stream_class *writer_stream_class,
-               struct bt_ctf_trace *trace)
+               struct bt_trace *writer_trace,
+               struct bt_stream_class *writer_stream_class,
+               struct bt_trace *trace)
 {
        enum bt_component_status ret;
        int int_ret, clock_class_count, i;
 
-       clock_class_count = bt_ctf_trace_get_clock_class_count(trace);
+       clock_class_count = bt_trace_get_clock_class_count(trace);
 
        for (i = 0; i < clock_class_count; i++) {
-               struct bt_ctf_clock_class *writer_clock_class;
-               struct bt_ctf_clock_class *clock_class =
-                       bt_ctf_trace_get_clock_class_by_index(trace, i);
+               struct bt_clock_class *writer_clock_class;
+               struct bt_clock_class *clock_class =
+                       bt_trace_get_clock_class_by_index(trace, i);
 
                assert(clock_class);
 
@@ -119,7 +119,7 @@ enum bt_component_status ctf_copy_clock_classes(FILE *err,
                        goto end;
                }
 
-               int_ret = bt_ctf_trace_add_clock_class(writer_trace, writer_clock_class);
+               int_ret = bt_trace_add_clock_class(writer_trace, writer_clock_class);
                if (int_ret != 0) {
                        BT_PUT(writer_clock_class);
                        BT_LOGE_STR("Failed to add clock class.");
@@ -140,46 +140,46 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
-               struct bt_ctf_event_class *event_class)
+struct bt_event_class *ctf_copy_event_class(FILE *err,
+               struct bt_event_class *event_class)
 {
-       struct bt_ctf_event_class *writer_event_class = NULL;
-       struct bt_ctf_field_type *context, *payload_type;
+       struct bt_event_class *writer_event_class = NULL;
+       struct bt_field_type *context, *payload_type;
        const char *name;
        int ret;
        int64_t id;
-       enum bt_ctf_event_class_log_level log_level;
+       enum bt_event_class_log_level log_level;
        const char *emf_uri;
 
-       name = bt_ctf_event_class_get_name(event_class);
+       name = bt_event_class_get_name(event_class);
 
-       writer_event_class = bt_ctf_event_class_create(name);
+       writer_event_class = bt_event_class_create(name);
        assert(writer_event_class);
 
-       id = bt_ctf_event_class_get_id(event_class);
+       id = bt_event_class_get_id(event_class);
        assert(id >= 0);
 
-       ret = bt_ctf_event_class_set_id(writer_event_class, id);
+       ret = bt_event_class_set_id(writer_event_class, id);
        if (ret) {
                BT_LOGE_STR("Failed to set event_class id.");
                goto error;
        }
 
-       log_level = bt_ctf_event_class_get_log_level(event_class);
+       log_level = bt_event_class_get_log_level(event_class);
        if (log_level < 0) {
                BT_LOGE_STR("Failed to get log_level.");
                goto error;
        }
 
-       ret = bt_ctf_event_class_set_log_level(writer_event_class, log_level);
+       ret = bt_event_class_set_log_level(writer_event_class, log_level);
        if (ret) {
                BT_LOGE_STR("Failed to set log_level.");
                goto error;
        }
 
-       emf_uri = bt_ctf_event_class_get_emf_uri(event_class);
+       emf_uri = bt_event_class_get_emf_uri(event_class);
        if (emf_uri) {
-               ret = bt_ctf_event_class_set_emf_uri(writer_event_class,
+               ret = bt_event_class_set_emf_uri(writer_event_class,
                        emf_uri);
                if (ret) {
                        BT_LOGE_STR("Failed to set emf uri.");
@@ -187,9 +187,9 @@ struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
                }
        }
 
-       payload_type = bt_ctf_event_class_get_payload_type(event_class);
+       payload_type = bt_event_class_get_payload_type(event_class);
        if (payload_type) {
-               ret = bt_ctf_event_class_set_payload_type(writer_event_class,
+               ret = bt_event_class_set_payload_type(writer_event_class,
                                payload_type);
                if (ret < 0) {
                        BT_LOGE_STR("Failed to set payload type.");
@@ -198,9 +198,9 @@ struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
                BT_PUT(payload_type);
        }
 
-       context = bt_ctf_event_class_get_context_type(event_class);
+       context = bt_event_class_get_context_type(event_class);
        if (context) {
-               ret = bt_ctf_event_class_set_context_type(
+               ret = bt_event_class_set_context_type(
                                writer_event_class, context);
                BT_PUT(context);
                if (ret < 0) {
@@ -219,25 +219,25 @@ end:
 
 BT_HIDDEN
 enum bt_component_status ctf_copy_event_classes(FILE *err,
-               struct bt_ctf_stream_class *stream_class,
-               struct bt_ctf_stream_class *writer_stream_class)
+               struct bt_stream_class *stream_class,
+               struct bt_stream_class *writer_stream_class)
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_ctf_event_class *event_class = NULL, *writer_event_class = NULL;
+       struct bt_event_class *event_class = NULL, *writer_event_class = NULL;
        int count, i;
 
-       count = bt_ctf_stream_class_get_event_class_count(stream_class);
+       count = bt_stream_class_get_event_class_count(stream_class);
        assert(count >= 0);
 
        for (i = 0; i < count; i++) {
                int int_ret;
 
-               event_class = bt_ctf_stream_class_get_event_class_by_index(
+               event_class = bt_stream_class_get_event_class_by_index(
                                stream_class, i);
                assert(event_class);
 
-               if (i < bt_ctf_stream_class_get_event_class_count(writer_stream_class)) {
-                       writer_event_class = bt_ctf_stream_class_get_event_class_by_index(
+               if (i < bt_stream_class_get_event_class_count(writer_stream_class)) {
+                       writer_event_class = bt_stream_class_get_event_class_by_index(
                                        writer_stream_class, i);
                        if (writer_event_class) {
                                /*
@@ -259,7 +259,7 @@ enum bt_component_status ctf_copy_event_classes(FILE *err,
                        goto error;
                }
 
-               int_ret = bt_ctf_stream_class_add_event_class(writer_stream_class,
+               int_ret = bt_stream_class_add_event_class(writer_stream_class,
                                writer_event_class);
                if (int_ret < 0) {
                        BT_LOGE_STR("Failed to add event class.");
@@ -280,22 +280,22 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
-               struct bt_ctf_stream_class *stream_class,
-               struct bt_ctf_trace *writer_trace,
+struct bt_stream_class *ctf_copy_stream_class(FILE *err,
+               struct bt_stream_class *stream_class,
+               struct bt_trace *writer_trace,
                bool override_ts64)
 {
-       struct bt_ctf_field_type *type = NULL;
-       struct bt_ctf_stream_class *writer_stream_class = NULL;
+       struct bt_field_type *type = NULL;
+       struct bt_stream_class *writer_stream_class = NULL;
        int ret_int;
-       const char *name = bt_ctf_stream_class_get_name(stream_class);
+       const char *name = bt_stream_class_get_name(stream_class);
 
-       writer_stream_class = bt_ctf_stream_class_create_empty(name);
+       writer_stream_class = bt_stream_class_create_empty(name);
        assert(writer_stream_class);
 
-       type = bt_ctf_stream_class_get_packet_context_type(stream_class);
+       type = bt_stream_class_get_packet_context_type(stream_class);
        if (type) {
-               ret_int = bt_ctf_stream_class_set_packet_context_type(
+               ret_int = bt_stream_class_set_packet_context_type(
                                writer_stream_class, type);
                if (ret_int < 0) {
                        BT_LOGE_STR("Failed to set packet_context type.");
@@ -304,12 +304,12 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
                BT_PUT(type);
        }
 
-       type = bt_ctf_stream_class_get_event_header_type(stream_class);
+       type = bt_stream_class_get_event_header_type(stream_class);
        if (type) {
-               ret_int = bt_ctf_trace_get_clock_class_count(writer_trace);
+               ret_int = bt_trace_get_clock_class_count(writer_trace);
                assert(ret_int >= 0);
                if (override_ts64 && ret_int > 0) {
-                       struct bt_ctf_field_type *new_event_header_type;
+                       struct bt_field_type *new_event_header_type;
 
                        new_event_header_type = override_header_type(err, type,
                                        writer_trace);
@@ -317,7 +317,7 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
                                BT_LOGE_STR("Failed to override header type.");
                                goto error;
                        }
-                       ret_int = bt_ctf_stream_class_set_event_header_type(
+                       ret_int = bt_stream_class_set_event_header_type(
                                        writer_stream_class, new_event_header_type);
                        BT_PUT(new_event_header_type);
                        if (ret_int < 0) {
@@ -325,7 +325,7 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
                                goto error;
                        }
                } else {
-                       ret_int = bt_ctf_stream_class_set_event_header_type(
+                       ret_int = bt_stream_class_set_event_header_type(
                                        writer_stream_class, type);
                        if (ret_int < 0) {
                                BT_LOGE_STR("Failed to set event_header type.");
@@ -335,9 +335,9 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
                BT_PUT(type);
        }
 
-       type = bt_ctf_stream_class_get_event_context_type(stream_class);
+       type = bt_stream_class_get_event_context_type(stream_class);
        if (type) {
-               ret_int = bt_ctf_stream_class_set_event_context_type(
+               ret_int = bt_stream_class_set_event_context_type(
                                writer_stream_class, type);
                if (ret_int < 0) {
                        BT_LOGE_STR("Failed to set event_contexttype.");
@@ -356,24 +356,24 @@ end:
 }
 
 BT_HIDDEN
-int ctf_stream_copy_packet_header(FILE *err, struct bt_ctf_packet *packet,
-               struct bt_ctf_stream *writer_stream)
+int ctf_stream_copy_packet_header(FILE *err, struct bt_packet *packet,
+               struct bt_stream *writer_stream)
 {
-       struct bt_ctf_field *packet_header = NULL, *writer_packet_header = NULL;
+       struct bt_field *packet_header = NULL, *writer_packet_header = NULL;
        int ret = 0;
 
-       packet_header = bt_ctf_packet_get_header(packet);
+       packet_header = bt_packet_get_header(packet);
        if (!packet_header) {
                goto end;
        }
 
-       writer_packet_header = bt_ctf_field_copy(packet_header);
+       writer_packet_header = bt_field_copy(packet_header);
        if (!writer_packet_header) {
                BT_LOGE_STR("Failed to copy field from stream packet header.");
                goto error;
        }
 
-       ret = bt_ctf_stream_set_packet_header(writer_stream,
+       ret = bt_stream_set_packet_header(writer_stream,
                        writer_packet_header);
        if (ret) {
                BT_LOGE_STR("Failed to set stream packet header.");
@@ -391,24 +391,24 @@ end:
 }
 
 BT_HIDDEN
-int ctf_packet_copy_header(FILE *err, struct bt_ctf_packet *packet,
-               struct bt_ctf_packet *writer_packet)
+int ctf_packet_copy_header(FILE *err, struct bt_packet *packet,
+               struct bt_packet *writer_packet)
 {
-       struct bt_ctf_field *packet_header = NULL, *writer_packet_header = NULL;
+       struct bt_field *packet_header = NULL, *writer_packet_header = NULL;
        int ret = 0;
 
-       packet_header = bt_ctf_packet_get_header(packet);
+       packet_header = bt_packet_get_header(packet);
        if (!packet_header) {
                goto end;
        }
 
-       writer_packet_header = bt_ctf_field_copy(packet_header);
+       writer_packet_header = bt_field_copy(packet_header);
        if (!writer_packet_header) {
                BT_LOGE_STR("Failed to copy field from packet header.");
                goto error;
        }
 
-       ret = bt_ctf_packet_set_header(writer_packet, writer_packet_header);
+       ret = bt_packet_set_header(writer_packet, writer_packet_header);
        if (ret) {
                BT_LOGE_STR("Failed to set packet header.");
                goto error;
@@ -425,24 +425,24 @@ end:
 }
 
 BT_HIDDEN
-int ctf_stream_copy_packet_context(FILE *err, struct bt_ctf_packet *packet,
-               struct bt_ctf_stream *writer_stream)
+int ctf_stream_copy_packet_context(FILE *err, struct bt_packet *packet,
+               struct bt_stream *writer_stream)
 {
-       struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL;
+       struct bt_field *packet_context = NULL, *writer_packet_context = NULL;
        int ret = 0;
 
-       packet_context = bt_ctf_packet_get_context(packet);
+       packet_context = bt_packet_get_context(packet);
        if (!packet_context) {
                goto end;
        }
 
-       writer_packet_context = bt_ctf_field_copy(packet_context);
+       writer_packet_context = bt_field_copy(packet_context);
        if (!writer_packet_context) {
                BT_LOGE_STR("Failed to copy field from stream packet context.");
                goto error;
        }
 
-       ret = bt_ctf_stream_set_packet_context(writer_stream,
+       ret = bt_stream_set_packet_context(writer_stream,
                        writer_packet_context);
        if (ret) {
                BT_LOGE_STR("Failed to set stream packet context.");
@@ -460,25 +460,25 @@ end:
 }
 
 BT_HIDDEN
-int ctf_packet_copy_context(FILE *err, struct bt_ctf_packet *packet,
-               struct bt_ctf_stream *writer_stream,
-               struct bt_ctf_packet *writer_packet)
+int ctf_packet_copy_context(FILE *err, struct bt_packet *packet,
+               struct bt_stream *writer_stream,
+               struct bt_packet *writer_packet)
 {
-       struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL;
+       struct bt_field *packet_context = NULL, *writer_packet_context = NULL;
        int ret = 0;
 
-       packet_context = bt_ctf_packet_get_context(packet);
+       packet_context = bt_packet_get_context(packet);
        if (!packet_context) {
                goto end;
        }
 
-       writer_packet_context = bt_ctf_field_copy(packet_context);
+       writer_packet_context = bt_field_copy(packet_context);
        if (!writer_packet_context) {
                BT_LOGE_STR("Failed to copy field from packet context.");
                goto error;
        }
 
-       ret = bt_ctf_packet_set_context(writer_packet, writer_packet_context);
+       ret = bt_packet_set_context(writer_packet, writer_packet_context);
        if (ret) {
                BT_LOGE_STR("Failed to set packet context.");
                goto error;
@@ -495,16 +495,16 @@ end:
 }
 
 BT_HIDDEN
-int ctf_copy_event_header(FILE *err, struct bt_ctf_event *event,
-               struct bt_ctf_event_class *writer_event_class,
-               struct bt_ctf_event *writer_event,
-               struct bt_ctf_field *event_header)
+int ctf_copy_event_header(FILE *err, struct bt_event *event,
+               struct bt_event_class *writer_event_class,
+               struct bt_event *writer_event,
+               struct bt_field *event_header)
 {
-       struct bt_ctf_clock_class *clock_class = NULL, *writer_clock_class = NULL;
-       struct bt_ctf_clock_value *clock_value = NULL, *writer_clock_value = NULL;
+       struct bt_clock_class *clock_class = NULL, *writer_clock_class = NULL;
+       struct bt_clock_value *clock_value = NULL, *writer_clock_value = NULL;
 
        int ret;
-       struct bt_ctf_field *writer_event_header = NULL;
+       struct bt_field *writer_event_header = NULL;
        uint64_t value;
 
        clock_class = event_get_clock_class(err, event);
@@ -513,11 +513,11 @@ int ctf_copy_event_header(FILE *err, struct bt_ctf_event *event,
                goto error;
        }
 
-       clock_value = bt_ctf_event_get_clock_value(event, clock_class);
+       clock_value = bt_event_get_clock_value(event, clock_class);
        BT_PUT(clock_class);
        assert(clock_value);
 
-       ret = bt_ctf_clock_value_get_value(clock_value, &value);
+       ret = bt_clock_value_get_value(clock_value, &value);
        BT_PUT(clock_value);
        if (ret) {
                BT_LOGE_STR("Failed to get clock value.");
@@ -530,27 +530,27 @@ int ctf_copy_event_header(FILE *err, struct bt_ctf_event *event,
                goto error;
        }
 
-       writer_clock_value = bt_ctf_clock_value_create(writer_clock_class, value);
+       writer_clock_value = bt_clock_value_create(writer_clock_class, value);
        BT_PUT(writer_clock_class);
        if (!writer_clock_value) {
                BT_LOGE_STR("Failed to create clock value.");
                goto error;
        }
 
-       ret = bt_ctf_event_set_clock_value(writer_event, writer_clock_value);
+       ret = bt_event_set_clock_value(writer_event, writer_clock_value);
        BT_PUT(writer_clock_value);
        if (ret) {
                BT_LOGE_STR("Failed to set clock value.");
                goto error;
        }
 
-       writer_event_header = bt_ctf_field_copy(event_header);
+       writer_event_header = bt_field_copy(event_header);
        if (!writer_event_header) {
                BT_LOGE_STR("Failed to copy event_header.");
                goto end;
        }
 
-       ret = bt_ctf_event_set_header(writer_event, writer_event_header);
+       ret = bt_event_set_header(writer_event, writer_event_header);
        BT_PUT(writer_event_header);
        if (ret < 0) {
                BT_LOGE_STR("Failed to set event_header.");
@@ -568,16 +568,16 @@ end:
 }
 
 static
-struct bt_ctf_trace *event_class_get_trace(FILE *err,
-               struct bt_ctf_event_class *event_class)
+struct bt_trace *event_class_get_trace(FILE *err,
+               struct bt_event_class *event_class)
 {
-       struct bt_ctf_trace *trace = NULL;
-       struct bt_ctf_stream_class *stream_class = NULL;
+       struct bt_trace *trace = NULL;
+       struct bt_stream_class *stream_class = NULL;
 
-       stream_class = bt_ctf_event_class_get_stream_class(event_class);
+       stream_class = bt_event_class_get_stream_class(event_class);
        assert(stream_class);
 
-       trace = bt_ctf_stream_class_get_trace(stream_class);
+       trace = bt_stream_class_get_trace(stream_class);
        assert(trace);
 
        bt_put(stream_class);
@@ -585,16 +585,16 @@ struct bt_ctf_trace *event_class_get_trace(FILE *err,
 }
 
 BT_HIDDEN
-struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
-               struct bt_ctf_event_class *writer_event_class,
+struct bt_event *ctf_copy_event(FILE *err, struct bt_event *event,
+               struct bt_event_class *writer_event_class,
                bool override_ts64)
 {
-       struct bt_ctf_event *writer_event = NULL;
-       struct bt_ctf_field *field = NULL, *copy_field = NULL;
-       struct bt_ctf_trace *writer_trace = NULL;
+       struct bt_event *writer_event = NULL;
+       struct bt_field *field = NULL, *copy_field = NULL;
+       struct bt_trace *writer_trace = NULL;
        int ret;
 
-       writer_event = bt_ctf_event_create(writer_event_class);
+       writer_event = bt_event_create(writer_event_class);
        if (!writer_event) {
                BT_LOGE_STR("Failed to create event.");
                goto error;
@@ -606,18 +606,18 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
                goto error;
        }
 
-       field = bt_ctf_event_get_header(event);
+       field = bt_event_get_header(event);
        if (field) {
                /*
                 * If override_ts64, we override all integer fields mapped to a
                 * clock to a uint64_t field type, otherwise, we just copy it as
                 * is.
                 */
-               ret = bt_ctf_trace_get_clock_class_count(writer_trace);
+               ret = bt_trace_get_clock_class_count(writer_trace);
                assert(ret >= 0);
 
                if (override_ts64 && ret > 0) {
-                       copy_field = bt_ctf_event_get_header(writer_event);
+                       copy_field = bt_event_get_header(writer_event);
                        assert(copy_field);
 
                        ret = copy_override_field(err, event, writer_event, field,
@@ -639,14 +639,14 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
        }
 
        /* Optional field, so it can fail silently. */
-       field = bt_ctf_event_get_stream_event_context(event);
+       field = bt_event_get_stream_event_context(event);
        if (field) {
-               copy_field = bt_ctf_field_copy(field);
+               copy_field = bt_field_copy(field);
                if (!copy_field) {
                        BT_LOGE_STR("Failed to copy field.");
                        goto error;
                }
-               ret = bt_ctf_event_set_stream_event_context(writer_event,
+               ret = bt_event_set_stream_event_context(writer_event,
                                copy_field);
                if (ret < 0) {
                        BT_LOGE_STR("Failed to set stream_event_context.");
@@ -657,14 +657,14 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
        }
 
        /* Optional field, so it can fail silently. */
-       field = bt_ctf_event_get_event_context(event);
+       field = bt_event_get_event_context(event);
        if (field) {
-               copy_field = bt_ctf_field_copy(field);
+               copy_field = bt_field_copy(field);
                if (!copy_field) {
                        BT_LOGE_STR("Failed to copy field.");
                        goto error;
                }
-               ret = bt_ctf_event_set_event_context(writer_event, copy_field);
+               ret = bt_event_set_event_context(writer_event, copy_field);
                if (ret < 0) {
                        BT_LOGE_STR("Failed to set event_context.");
                        goto error;
@@ -673,14 +673,14 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
                BT_PUT(copy_field);
        }
 
-       field = bt_ctf_event_get_event_payload(event);
+       field = bt_event_get_event_payload(event);
        if (field) {
-               copy_field = bt_ctf_field_copy(field);
+               copy_field = bt_field_copy(field);
                if (!copy_field) {
                        BT_LOGE_STR("Failed to copy field.");
                        goto error;
                }
-               ret = bt_ctf_event_set_event_payload(writer_event, copy_field);
+               ret = bt_event_set_event_payload(writer_event, copy_field);
                if (ret < 0) {
                        BT_LOGE_STR("Failed to set event_payload.");
                        goto error;
@@ -701,31 +701,31 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
-               struct bt_ctf_trace *writer_trace)
+enum bt_component_status ctf_copy_trace(FILE *err, struct bt_trace *trace,
+               struct bt_trace *writer_trace)
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        int field_count, i, int_ret;
-       struct bt_ctf_field_type *header_type = NULL;
-       enum bt_ctf_byte_order order;
+       struct bt_field_type *header_type = NULL;
+       enum bt_byte_order order;
        const char *trace_name;
        const unsigned char *trace_uuid;
 
-       field_count = bt_ctf_trace_get_environment_field_count(trace);
+       field_count = bt_trace_get_environment_field_count(trace);
        for (i = 0; i < field_count; i++) {
                int ret_int;
                const char *name;
                struct bt_value *value = NULL;
 
-               name = bt_ctf_trace_get_environment_field_name_by_index(
+               name = bt_trace_get_environment_field_name_by_index(
                        trace, i);
                assert(name);
 
-               value = bt_ctf_trace_get_environment_field_value_by_index(
+               value = bt_trace_get_environment_field_value_by_index(
                        trace, i);
                assert(value);
 
-               ret_int = bt_ctf_trace_set_environment_field(writer_trace,
+               ret_int = bt_trace_set_environment_field(writer_trace,
                                name, value);
                BT_PUT(value);
                if (ret_int < 0) {
@@ -736,8 +736,8 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
                }
        }
 
-       order = bt_ctf_trace_get_native_byte_order(trace);
-       assert(order != BT_CTF_BYTE_ORDER_UNKNOWN);
+       order = bt_trace_get_native_byte_order(trace);
+       assert(order != BT_BYTE_ORDER_UNKNOWN);
 
        /*
         * Only explicitly set the writer trace's native byte order if
@@ -745,8 +745,8 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
         * the CTF writer object chooses, which is the machine's native
         * byte order.
         */
-       if (order != BT_CTF_BYTE_ORDER_UNSPECIFIED) {
-               ret = bt_ctf_trace_set_native_byte_order(writer_trace, order);
+       if (order != BT_BYTE_ORDER_UNSPECIFIED) {
+               ret = bt_trace_set_native_byte_order(writer_trace, order);
                if (ret) {
                        BT_LOGE_STR("Failed to set native byte order.");
                        ret = BT_COMPONENT_STATUS_ERROR;
@@ -754,9 +754,9 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
                }
        }
 
-       header_type = bt_ctf_trace_get_packet_header_type(trace);
+       header_type = bt_trace_get_packet_header_type(trace);
        if (header_type) {
-               int_ret = bt_ctf_trace_set_packet_header_type(writer_trace, header_type);
+               int_ret = bt_trace_set_packet_header_type(writer_trace, header_type);
                BT_PUT(header_type);
                if (int_ret < 0) {
                        BT_LOGE_STR("Failed to set packet header type.");
@@ -765,9 +765,9 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
                }
        }
 
-       trace_name = bt_ctf_trace_get_name(trace);
+       trace_name = bt_trace_get_name(trace);
        if (trace_name) {
-               int_ret = bt_ctf_trace_set_name(writer_trace, trace_name);
+               int_ret = bt_trace_set_name(writer_trace, trace_name);
                if (int_ret < 0) {
                        BT_LOGE_STR("Failed to set trace name.");
                        ret = BT_COMPONENT_STATUS_ERROR;
@@ -775,9 +775,9 @@ enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
                }
        }
 
-       trace_uuid = bt_ctf_trace_get_uuid(trace);
+       trace_uuid = bt_trace_get_uuid(trace);
        if (trace_uuid) {
-               int_ret = bt_ctf_trace_set_uuid(writer_trace, trace_uuid);
+               int_ret = bt_trace_set_uuid(writer_trace, trace_uuid);
                if (int_ret < 0) {
                        BT_LOGE_STR("Failed to set trace UUID.");
                        ret = BT_COMPONENT_STATUS_ERROR;
This page took 0.037114 seconds and 4 git commands to generate.