X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Fcopy.c;h=423a76658245754f07f8369767d1e0e8726a529e;hb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;hp=a8c5d5cdd9bcd521543d0dc7cecf85c3d88930c2;hpb=19ce87a480ab119ed5339fb5725620a7347d7d86;p=babeltrace.git diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c index a8c5d5cd..423a7665 100644 --- a/plugins/utils/trimmer/copy.c +++ b/plugins/utils/trimmer/copy.c @@ -26,197 +26,142 @@ * 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) +const struct bt_packet *lookup_packet(struct trimmer_iterator *trim_it, + const struct bt_packet *packet) { - return (struct bt_ctf_packet *) g_hash_table_lookup( + return (const 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) +const struct bt_packet *insert_new_packet(struct trimmer_iterator *trim_it, + const struct bt_packet *packet, + const struct bt_stream *stream) { - struct bt_ctf_packet *writer_packet; + const 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; + } + + 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); + g_hash_table_insert(trim_it->packet_map, (gpointer) packet, + writer_packet); + goto end; + +error: + BT_PACKET_PUT_REF_AND_RESET(writer_packet); end: return writer_packet; } BT_HIDDEN enum bt_component_status update_packet_context_field(FILE *err, - struct bt_ctf_packet *writer_packet, + const struct bt_packet *writer_packet, const char *name, int64_t value) { enum bt_component_status ret; - struct bt_ctf_field *packet_context, *writer_packet_context; - struct bt_ctf_field_type *struct_type, *writer_packet_context_type; - struct bt_ctf_stream_class *stream_class; - struct bt_ctf_stream *stream; + const struct bt_field *packet_context = NULL, *writer_packet_context = NULL; + const struct bt_field_class *struct_class = NULL, *field_class = NULL; + const 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) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end; - } - - stream = bt_ctf_packet_get_stream(writer_packet); - if (!stream) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end_put_packet_context; - } - - stream_class = bt_ctf_stream_get_class(stream); - if (!stream_class) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end_put_stream; - } - - writer_packet_context_type = bt_ctf_stream_class_get_packet_context_type( - stream_class); - if (!writer_packet_context_type) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end_put_stream_class; - } + 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) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end_put_writer_packet_context_type; - } + struct_class = bt_field_get_class(packet_context); + BT_ASSERT(struct_class); - writer_packet_context = bt_ctf_packet_get_context(writer_packet); - if (!writer_packet_context) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end_put_struct_type; - } + 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++) { - struct bt_ctf_field *field, *writer_field; - struct bt_ctf_field_type *field_type; 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) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end_put_writer_packet_context; + 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) { - ret = BT_COMPONENT_STATUS_ERROR; - bt_put(field); - fprintf(err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end_put_writer_packet_context; + 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); + BT_OBJECT_PUT_REF_AND_RESET(field_class); + BT_OBJECT_PUT_REF_AND_RESET(field); continue; } - if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_TYPE_ID_INTEGER) { - fprintf(err, "[error] Unexpected packet context field type\n"); - bt_put(field); - ret = BT_COMPONENT_STATUS_ERROR; - goto end_put_writer_packet_context; + 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); - if (!writer_field) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end; - } + BT_ASSERT(writer_field); - int_ret = bt_ctf_field_unsigned_integer_set_value(writer_field, value); - bt_put(writer_field); - if (int_ret < 0) { - ret = BT_COMPONENT_STATUS_ERROR; - fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, - __LINE__); - goto end_put_writer_packet_context; - } + int_ret = bt_field_unsigned_integer_set_value(writer_field, value); + BT_ASSERT(int_ret == 0); - bt_put(field_type); - bt_put(field); + BT_OBJECT_PUT_REF_AND_RESET(writer_field); + BT_OBJECT_PUT_REF_AND_RESET(field_class); + BT_OBJECT_PUT_REF_AND_RESET(field); } ret = BT_COMPONENT_STATUS_OK; + goto end; -end_put_writer_packet_context: - bt_put(writer_packet_context); -end_put_struct_type: - bt_put(struct_type); -end_put_writer_packet_context_type: - bt_put(writer_packet_context_type); -end_put_stream_class: - bt_put(stream_class); -end_put_packet_context: - bt_put(packet_context); -end_put_stream: - bt_put(stream); +error: + bt_object_put_ref(writer_field); + bt_object_put_ref(field_class); + bt_object_put_ref(field); + ret = BT_COMPONENT_STATUS_ERROR; end: + bt_object_put_ref(struct_class); + bt_object_put_ref(packet_context); return ret; } BT_HIDDEN -struct bt_ctf_packet *trimmer_new_packet( +const struct bt_packet *trimmer_new_packet( struct trimmer_iterator *trim_it, - struct bt_ctf_packet *packet) + const struct bt_packet *packet) { - struct bt_ctf_stream *stream; - struct bt_ctf_field *writer_packet_context; - struct bt_ctf_packet *writer_packet = NULL; + const struct bt_stream *stream = NULL; + const 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 end; - } + stream = bt_packet_get_stream(packet); + BT_ASSERT(stream); /* * If a packet was already opened, close it and remove it from @@ -225,53 +170,42 @@ struct bt_ctf_packet *trimmer_new_packet( writer_packet = lookup_packet(trim_it, packet); if (writer_packet) { g_hash_table_remove(trim_it->packet_map, packet); - bt_put(writer_packet); + BT_PACKET_PUT_REF_AND_RESET(writer_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__); - goto end_put_stream; - } - bt_get(writer_packet); - - writer_packet_context = ctf_copy_packet_context(trim_it->err, packet, - stream); - if (!writer_packet_context) { - BT_PUT(writer_packet); - fprintf(trim_it->err, "[error] %s in %s:%d\n", - __func__, __FILE__, __LINE__); - goto end_put_stream; + BT_LOGE_STR("Failed to insert new packet."); + goto error; } + bt_packet_get_ref(writer_packet); - int_ret = bt_ctf_packet_set_context(writer_packet, writer_packet_context); - if (int_ret) { - BT_PUT(writer_packet); - fprintf(trim_it->err, "[error] %s in %s:%d\n", - __func__, __FILE__, __LINE__); - goto end_put_writer_packet_context; + 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; } -end_put_writer_packet_context: - bt_put(writer_packet_context); -end_put_stream: - bt_put(stream); + goto end; + +error: + BT_PACKET_PUT_REF_AND_RESET(writer_packet); end: + bt_stream_put_ref(stream); return writer_packet; } BT_HIDDEN -struct bt_ctf_packet *trimmer_close_packet( +const struct bt_packet *trimmer_close_packet( struct trimmer_iterator *trim_it, - struct bt_ctf_packet *packet) + const struct bt_packet *packet) { - struct bt_ctf_packet *writer_packet; + const 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; } @@ -282,94 +216,55 @@ end: } BT_HIDDEN -struct bt_ctf_event *trimmer_output_event( +const struct bt_event *trimmer_output_event( struct trimmer_iterator *trim_it, - struct bt_ctf_event *event) + const struct bt_event *event) { - struct bt_ctf_event_class *event_class; - struct bt_ctf_stream *stream; - struct bt_ctf_stream_class *stream_class; - struct bt_ctf_event *writer_event = NULL; - struct bt_ctf_packet *packet, *writer_packet; + const struct bt_event_class *event_class = NULL; + const struct bt_event *writer_event = NULL; + const 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 end; - } - - 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 end_put_event_class; - } - - stream = bt_ctf_event_get_stream(event); - if (!stream) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end_put_event_class; - } + event_class = bt_event_get_class(event); + BT_ASSERT(event_class); - stream_class = bt_ctf_event_class_get_stream_class(event_class); - if (!stream_class) { - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end_put_stream; - } + 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)); - goto end_put_stream_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) { - BT_PUT(writer_event); - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end_put_stream_class; - } + packet = bt_event_get_packet(event); + BT_ASSERT(packet); writer_packet = lookup_packet(trim_it, packet); if (!writer_packet) { - BT_PUT(writer_event); - fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); - goto end_put_packet; + BT_LOGE_STR("Failed to find existing packet."); + goto error; } - bt_get(writer_packet); + bt_packet_get_ref(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_PUT(writer_event); - 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)); - goto end_put_writer_packet; + BT_LOGE("Failed to append event: event-class-name=\"%s\", event-name=\"%s\"", + bt_event_class_get_name(event_class), + event_name); + goto error; } - /* We keep the reference on the writer event */ - -end_put_writer_packet: - bt_put(writer_packet); -end_put_packet: - bt_put(packet); -end_put_stream_class: - bt_put(stream_class); -end_put_stream: - bt_put(stream); -end_put_event_class: - bt_put(event_class); + /* We keep the reference on the writer_event to create a notification. */ + goto end; + +error: + BT_OBJECT_PUT_REF_AND_RESET(writer_event); end: + bt_packet_put_ref(writer_packet); + bt_packet_put_ref(packet); + bt_event_class_put_ref(event_class); return writer_event; }