X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Fcopy.c;h=65f67d76235813ed9201893d654d8f4ac9e79a1b;hb=f6ccaed94e575af57fe6bf38154771bee4871a2a;hp=a76f7c054e28d45fb55331e19e0fb57ebea8e8ce;hpb=ab80adac56044ab951e76eb818c4ca1140d2a0a2;p=babeltrace.git diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c index a76f7c05..65f67d76 100644 --- a/plugins/utils/trimmer/copy.c +++ b/plugins/utils/trimmer/copy.c @@ -26,94 +26,91 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#define BT_LOG_TAG "PLUGIN-UTILS-TRIMMER-FLT-COPY" +#include "logging.h" + +#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; - writer_packet = bt_ctf_packet_create(stream); + BT_LOGD_STR("Inserting a new packet."); + writer_packet = bt_packet_create(stream); if (!writer_packet) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end; + BT_LOGE_STR("Failed to create a new packet."); + goto error; } - g_hash_table_insert(trim_it->packet_map, (gpointer) packet, writer_packet); + ret = ctf_packet_copy_header(trim_it->err, packet, writer_packet); + if (ret) { + BT_LOGE_STR("Failed to copy packet header."); + goto error; + } + + g_hash_table_insert(trim_it->packet_map, (gpointer) packet, + writer_packet); + goto end; + +error: + BT_PUT(writer_packet); end: return writer_packet; } 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; - packet_context = bt_ctf_packet_get_context(writer_packet); - if (!packet_context) { - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto error; - } + BT_LOGD("Updating packet context field: name=%s", name); + packet_context = bt_packet_get_context(writer_packet); + BT_ASSERT(packet_context); - struct_type = bt_ctf_field_get_type(packet_context); - if (!struct_type) { - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto error; - } + struct_type = bt_field_get_type(packet_context); + BT_ASSERT(struct_type); - writer_packet_context = bt_ctf_packet_get_context(writer_packet); - if (!writer_packet_context) { - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto error; - } + 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_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) { - fprintf(err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); + 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) { - fprintf(err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); + BT_LOGE("Failed to get field: field-name=\"%s\"", + field_name); goto error; } if (strcmp(field_name, name)) { @@ -121,24 +118,20 @@ 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) { - fprintf(err, "[error] Unexpected packet context field type\n"); + 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); - if (!writer_field) { - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto error; - } + BT_ASSERT(writer_field); + + int_ret = bt_field_unsigned_integer_set_value(writer_field, value); + BT_ASSERT(int_ret == 0); - int_ret = bt_ctf_field_unsigned_integer_set_value(writer_field, value); - if (int_ret < 0) { - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto error; - } BT_PUT(writer_field); BT_PUT(field_type); BT_PUT(field); @@ -159,21 +152,16 @@ 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_field *writer_packet_context = 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); - if (!stream) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", - __func__, __FILE__, __LINE__); - goto error; - } + stream = bt_packet_get_stream(packet); + BT_ASSERT(stream); /* * If a packet was already opened, close it and remove it from @@ -187,24 +175,15 @@ struct bt_ctf_packet *trimmer_new_packet( writer_packet = insert_new_packet(trim_it, packet, stream); if (!writer_packet) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", - __func__, __FILE__, __LINE__); + BT_LOGE_STR("Failed to insert new packet."); goto error; } bt_get(writer_packet); - writer_packet_context = ctf_copy_packet_context(trim_it->err, packet, - stream, 0); - if (!writer_packet_context) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", - __func__, __FILE__, __LINE__); - goto error; - } - - int_ret = bt_ctf_packet_set_context(writer_packet, writer_packet_context); - if (int_ret) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", - __func__, __FILE__, __LINE__); + int_ret = ctf_packet_copy_context(trim_it->err, packet, + stream, writer_packet); + if (int_ret < 0) { + BT_LOGE_STR("Failed to copy packet context."); goto error; } @@ -213,22 +192,20 @@ struct bt_ctf_packet *trimmer_new_packet( error: BT_PUT(writer_packet); end: - bt_put(writer_packet_context); bt_put(stream); return writer_packet; } 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) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); + BT_LOGE_STR("Failed to find existing packet."); goto end; } @@ -239,60 +216,44 @@ 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); - if (!event_class) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto error; - } + event_class = bt_event_get_class(event); + BT_ASSERT(event_class); - event_name = bt_ctf_event_class_get_name(event_class); - if (!event_name) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto error; - } + event_name = bt_event_class_get_name(event_class); writer_event = ctf_copy_event(trim_it->err, event, event_class, false); if (!writer_event) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - fprintf(trim_it->err, "[error] Failed to copy event %s\n", - bt_ctf_event_class_get_name(event_class)); + BT_LOGE("Failed to copy event: event-class-name=\"%s\", event-name=\"%s\"", + bt_event_class_get_name(event_class), + event_name); goto error; } - packet = bt_ctf_event_get_packet(event); - if (!packet) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto error; - } + packet = bt_event_get_packet(event); + BT_ASSERT(packet); writer_packet = lookup_packet(trim_it, packet); if (!writer_packet) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); + BT_LOGE_STR("Failed to find existing packet."); goto error; } 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) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - fprintf(trim_it->err, "[error] Failed to append event %s\n", - bt_ctf_event_class_get_name(event_class)); + BT_LOGE("Failed to append event: event-class-name=\"%s\", event-name=\"%s\"", + bt_event_class_get_name(event_class), + event_name); goto error; }