X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Fcopy.c;h=061e9a84d3f069baeac9b29e640b9addde36b395;hb=864cad701843d041ae0c9113fc2c20f9b3e1835d;hp=b925218920748411db47c22cba1dacd815067d43;hpb=c59fc0d5de5266ef3f37e46fb6cdef3fce64b0ca;p=babeltrace.git diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c index b9252189..061e9a84 100644 --- a/plugins/utils/trimmer/copy.c +++ b/plugins/utils/trimmer/copy.c @@ -29,39 +29,31 @@ #define BT_LOG_TAG "PLUGIN-UTILS-TRIMMER-FLT-COPY" #include "logging.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #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; @@ -85,63 +77,63 @@ 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_class *struct_class = NULL, *field_class = 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); - assert(packet_context); + packet_context = bt_packet_get_context(writer_packet); + BT_ASSERT(packet_context); - struct_type = bt_ctf_field_get_type(packet_context); - assert(struct_type); + struct_class = bt_field_get_class(packet_context); + BT_ASSERT(struct_class); - writer_packet_context = bt_ctf_packet_get_context(writer_packet); - assert(writer_packet_context); + writer_packet_context = bt_packet_get_context(writer_packet); + BT_ASSERT(writer_packet_context); - nr_fields = bt_ctf_field_type_structure_get_field_count(struct_type); + nr_fields = bt_field_class_structure_get_field_count(struct_class); 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, - &field_name, &field_type, i) < 0) { + if (bt_field_class_structure_get_field_by_index(struct_class, + &field_name, &field_class, i) < 0) { BT_LOGE("Failed to get field: field-name=\"%s\"", field_name); goto error; } if (strcmp(field_name, name)) { - BT_PUT(field_type); + BT_PUT(field_class); BT_PUT(field); continue; } - if (bt_ctf_field_type_get_type_id(field_type) != - BT_CTF_FIELD_TYPE_ID_INTEGER) { + if (bt_field_class_id(field_class) != + BT_FIELD_CLASS_TYPE_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); + BT_ASSERT(writer_field); - int_ret = bt_ctf_field_unsigned_integer_set_value(writer_field, value); - assert(int_ret == 0); + int_ret = bt_field_unsigned_integer_set_value(writer_field, value); + BT_ASSERT(int_ret == 0); BT_PUT(writer_field); - BT_PUT(field_type); + BT_PUT(field_class); BT_PUT(field); } @@ -150,26 +142,26 @@ enum bt_component_status update_packet_context_field(FILE *err, error: bt_put(writer_field); - bt_put(field_type); + bt_put(field_class); bt_put(field); ret = BT_COMPONENT_STATUS_ERROR; end: - bt_put(struct_type); + bt_put(struct_class); bt_put(packet_context); return ret; } 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); - assert(stream); + stream = bt_packet_get_stream(packet); + BT_ASSERT(stream); /* * If a packet was already opened, close it and remove it from @@ -205,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) { @@ -224,31 +216,31 @@ 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); - assert(event_class); + event_class = bt_event_get_class(event); + BT_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); - assert(packet); + packet = bt_event_get_packet(event); + BT_ASSERT(packet); writer_packet = lookup_packet(trim_it, packet); if (!writer_packet) { @@ -257,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; }