Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer
[babeltrace.git] / plugins / utils / trimmer / copy.c
index e7156efbbd2937975d7c25d6f50d909bfcd153d6..8b48e754bb1f865722a7ae99bb1dc0bcb2e343d1 100644 (file)
 #include "iterator.h"
 
 static
-struct bt_ctf_packet *lookup_packet(struct trimmer_iterator *trim_it,
-               struct bt_ctf_packet *packet)
+struct bt_packet *lookup_packet(struct trimmer_iterator *trim_it,
+               struct bt_packet *packet)
 {
-       return (struct bt_ctf_packet *) g_hash_table_lookup(
+       return (struct bt_packet *) g_hash_table_lookup(
                        trim_it->packet_map,
                        (gpointer) packet);
 }
 
 static
-struct bt_ctf_packet *insert_new_packet(struct trimmer_iterator *trim_it,
-               struct bt_ctf_packet *packet,
-               struct bt_ctf_stream *stream)
+struct bt_packet *insert_new_packet(struct trimmer_iterator *trim_it,
+               struct bt_packet *packet,
+               struct bt_stream *stream)
 {
-       struct bt_ctf_packet *writer_packet = NULL;
+       struct bt_packet *writer_packet = NULL;
        int ret;
 
        BT_LOGD_STR("Inserting a new packet.");
-       writer_packet = bt_ctf_packet_create(stream);
+       writer_packet = bt_packet_create(stream);
        if (!writer_packet) {
                BT_LOGE_STR("Failed to create a new packet.");
                goto error;
@@ -77,37 +77,37 @@ end:
 
 BT_HIDDEN
 enum bt_component_status update_packet_context_field(FILE *err,
-               struct bt_ctf_packet *writer_packet,
+               struct bt_packet *writer_packet,
                const char *name, int64_t value)
 {
        enum bt_component_status ret;
-       struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL;
-       struct bt_ctf_field_type *struct_type = NULL, *field_type = NULL;
-       struct bt_ctf_field *field = NULL, *writer_field = NULL;
+       struct bt_field *packet_context = NULL, *writer_packet_context = NULL;
+       struct bt_field_type *struct_type = NULL, *field_type = NULL;
+       struct bt_field *field = NULL, *writer_field = NULL;
        int nr_fields, i, int_ret;
 
        BT_LOGD("Updating packet context field: name=%s", name);
-       packet_context = bt_ctf_packet_get_context(writer_packet);
+       packet_context = bt_packet_get_context(writer_packet);
        assert(packet_context);
 
-       struct_type = bt_ctf_field_get_type(packet_context);
+       struct_type = bt_field_get_type(packet_context);
        assert(struct_type);
 
-       writer_packet_context = bt_ctf_packet_get_context(writer_packet);
+       writer_packet_context = bt_packet_get_context(writer_packet);
        assert(writer_packet_context);
 
-       nr_fields = bt_ctf_field_type_structure_get_field_count(struct_type);
+       nr_fields = bt_field_type_structure_get_field_count(struct_type);
        for (i = 0; i < nr_fields; i++) {
                const char *field_name;
 
-               field = bt_ctf_field_structure_get_field_by_index(
+               field = bt_field_structure_get_field_by_index(
                                packet_context, i);
                if (!field) {
                        BT_LOGE("Failed to get field in packet-context: field-name=\"%s\"",
                                        name);
                        goto error;
                }
-               if (bt_ctf_field_type_structure_get_field(struct_type,
+               if (bt_field_type_structure_get_field_by_index(struct_type,
                                        &field_name, &field_type, i) < 0) {
                        BT_LOGE("Failed to get field: field-name=\"%s\"",
                                        field_name);
@@ -118,18 +118,18 @@ enum bt_component_status update_packet_context_field(FILE *err,
                        BT_PUT(field);
                        continue;
                }
-               if (bt_ctf_field_type_get_type_id(field_type) !=
-                               BT_CTF_FIELD_TYPE_ID_INTEGER) {
+               if (bt_field_type_get_type_id(field_type) !=
+                               BT_FIELD_TYPE_ID_INTEGER) {
                        BT_LOGE("Expecting an integer for this field: field-name=\"%s\"",
                                        name);
                        goto error;
                }
 
-               writer_field = bt_ctf_field_structure_get_field(writer_packet_context,
+               writer_field = bt_field_structure_get_field_by_name(writer_packet_context,
                                field_name);
                assert(writer_field);
 
-               int_ret = bt_ctf_field_unsigned_integer_set_value(writer_field, value);
+               int_ret = bt_field_unsigned_integer_set_value(writer_field, value);
                assert(int_ret == 0);
 
                BT_PUT(writer_field);
@@ -152,15 +152,15 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_packet *trimmer_new_packet(
+struct bt_packet *trimmer_new_packet(
                struct trimmer_iterator *trim_it,
-               struct bt_ctf_packet *packet)
+               struct bt_packet *packet)
 {
-       struct bt_ctf_stream *stream = NULL;
-       struct bt_ctf_packet *writer_packet = NULL;
+       struct bt_stream *stream = NULL;
+       struct bt_packet *writer_packet = NULL;
        int int_ret;
 
-       stream = bt_ctf_packet_get_stream(packet);
+       stream = bt_packet_get_stream(packet);
        assert(stream);
 
        /*
@@ -197,11 +197,11 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_packet *trimmer_close_packet(
+struct bt_packet *trimmer_close_packet(
                struct trimmer_iterator *trim_it,
-               struct bt_ctf_packet *packet)
+               struct bt_packet *packet)
 {
-       struct bt_ctf_packet *writer_packet = NULL;
+       struct bt_packet *writer_packet = NULL;
 
        writer_packet = lookup_packet(trim_it, packet);
        if (!writer_packet) {
@@ -216,30 +216,30 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_event *trimmer_output_event(
+struct bt_event *trimmer_output_event(
                struct trimmer_iterator *trim_it,
-               struct bt_ctf_event *event)
+               struct bt_event *event)
 {
-       struct bt_ctf_event_class *event_class = NULL;
-       struct bt_ctf_event *writer_event = NULL;
-       struct bt_ctf_packet *packet = NULL, *writer_packet = NULL;
+       struct bt_event_class *event_class = NULL;
+       struct bt_event *writer_event = NULL;
+       struct bt_packet *packet = NULL, *writer_packet = NULL;
        const char *event_name;
        int int_ret;
 
-       event_class = bt_ctf_event_get_class(event);
+       event_class = bt_event_get_class(event);
        assert(event_class);
 
-       event_name = bt_ctf_event_class_get_name(event_class);
+       event_name = bt_event_class_get_name(event_class);
 
        writer_event = ctf_copy_event(trim_it->err, event, event_class, false);
        if (!writer_event) {
                BT_LOGE("Failed to copy event: event-class-name=\"%s\", event-name=\"%s\"",
-                               bt_ctf_event_class_get_name(event_class),
+                               bt_event_class_get_name(event_class),
                                event_name);
                goto error;
        }
 
-       packet = bt_ctf_event_get_packet(event);
+       packet = bt_event_get_packet(event);
        assert(packet);
 
        writer_packet = lookup_packet(trim_it, packet);
@@ -249,10 +249,10 @@ struct bt_ctf_event *trimmer_output_event(
        }
        bt_get(writer_packet);
 
-       int_ret = bt_ctf_event_set_packet(writer_event, writer_packet);
+       int_ret = bt_event_set_packet(writer_event, writer_packet);
        if (int_ret < 0) {
                BT_LOGE("Failed to append event: event-class-name=\"%s\", event-name=\"%s\"",
-                               bt_ctf_event_class_get_name(event_class),
+                               bt_event_class_get_name(event_class),
                                event_name);
                goto error;
        }
This page took 0.027553 seconds and 4 git commands to generate.