X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Fcopy.c;h=33583c20dd0f259e7c41640f9b59883860068362;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=8b48e754bb1f865722a7ae99bb1dc0bcb2e343d1;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=babeltrace.git diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c index 8b48e754..33583c20 100644 --- a/plugins/utils/trimmer/copy.c +++ b/plugins/utils/trimmer/copy.c @@ -29,27 +29,27 @@ #define BT_LOG_TAG "PLUGIN-UTILS-TRIMMER-FLT-COPY" #include "logging.h" -#include +#include #include #include #include "iterator.h" static -struct bt_packet *lookup_packet(struct trimmer_iterator *trim_it, - struct bt_packet *packet) +const bt_packet *lookup_packet(struct trimmer_iterator *trim_it, + const bt_packet *packet) { - return (struct bt_packet *) g_hash_table_lookup( + return (const bt_packet *) g_hash_table_lookup( trim_it->packet_map, (gpointer) packet); } static -struct bt_packet *insert_new_packet(struct trimmer_iterator *trim_it, - struct bt_packet *packet, - struct bt_stream *stream) +const bt_packet *insert_new_packet(struct trimmer_iterator *trim_it, + const bt_packet *packet, + const bt_stream *stream) { - struct bt_packet *writer_packet = NULL; + const bt_packet *writer_packet = NULL; int ret; BT_LOGD_STR("Inserting a new packet."); @@ -70,33 +70,33 @@ struct bt_packet *insert_new_packet(struct trimmer_iterator *trim_it, goto end; error: - BT_PUT(writer_packet); + 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_packet *writer_packet, + const bt_packet *writer_packet, const char *name, int64_t value) { enum bt_component_status ret; - 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; + const bt_field *packet_context = NULL, *writer_packet_context = NULL; + const bt_field_class *struct_class = NULL, *field_class = NULL; + const 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_packet_get_context(writer_packet); - assert(packet_context); + BT_ASSERT(packet_context); - struct_type = bt_field_get_type(packet_context); - assert(struct_type); + struct_class = bt_field_get_class(packet_context); + BT_ASSERT(struct_class); writer_packet_context = bt_packet_get_context(writer_packet); - assert(writer_packet_context); + BT_ASSERT(writer_packet_context); - nr_fields = bt_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; @@ -107,19 +107,19 @@ enum bt_component_status update_packet_context_field(FILE *err, name); goto error; } - if (bt_field_type_structure_get_field_by_index(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); + BT_OBJECT_PUT_REF_AND_RESET(field_class); + BT_OBJECT_PUT_REF_AND_RESET(field); continue; } - if (bt_field_type_get_type_id(field_type) != - BT_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; @@ -127,41 +127,41 @@ enum bt_component_status update_packet_context_field(FILE *err, writer_field = bt_field_structure_get_field_by_name(writer_packet_context, field_name); - assert(writer_field); + BT_ASSERT(writer_field); int_ret = bt_field_unsigned_integer_set_value(writer_field, value); - assert(int_ret == 0); + BT_ASSERT(int_ret == 0); - BT_PUT(writer_field); - 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; error: - bt_put(writer_field); - bt_put(field_type); - bt_put(field); + bt_object_put_ref(writer_field); + bt_object_put_ref(field_class); + bt_object_put_ref(field); ret = BT_COMPONENT_STATUS_ERROR; end: - bt_put(struct_type); - bt_put(packet_context); + bt_object_put_ref(struct_class); + bt_object_put_ref(packet_context); return ret; } BT_HIDDEN -struct bt_packet *trimmer_new_packet( +const bt_packet *trimmer_new_packet( struct trimmer_iterator *trim_it, - struct bt_packet *packet) + const bt_packet *packet) { - struct bt_stream *stream = NULL; - struct bt_packet *writer_packet = NULL; + const bt_stream *stream = NULL; + const bt_packet *writer_packet = NULL; int int_ret; stream = bt_packet_get_stream(packet); - assert(stream); + BT_ASSERT(stream); /* * If a packet was already opened, close it and remove it from @@ -170,7 +170,7 @@ struct bt_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); @@ -178,7 +178,7 @@ struct bt_packet *trimmer_new_packet( BT_LOGE_STR("Failed to insert new packet."); goto error; } - bt_get(writer_packet); + bt_packet_get_ref(writer_packet); int_ret = ctf_packet_copy_context(trim_it->err, packet, stream, writer_packet); @@ -190,18 +190,18 @@ struct bt_packet *trimmer_new_packet( goto end; error: - BT_PUT(writer_packet); + BT_PACKET_PUT_REF_AND_RESET(writer_packet); end: - bt_put(stream); + bt_stream_put_ref(stream); return writer_packet; } BT_HIDDEN -struct bt_packet *trimmer_close_packet( +const bt_packet *trimmer_close_packet( struct trimmer_iterator *trim_it, - struct bt_packet *packet) + const bt_packet *packet) { - struct bt_packet *writer_packet = NULL; + const bt_packet *writer_packet = NULL; writer_packet = lookup_packet(trim_it, packet); if (!writer_packet) { @@ -216,18 +216,18 @@ end: } BT_HIDDEN -struct bt_event *trimmer_output_event( +const bt_event *trimmer_output_event( struct trimmer_iterator *trim_it, - struct bt_event *event) + const bt_event *event) { - struct bt_event_class *event_class = NULL; - struct bt_event *writer_event = NULL; - struct bt_packet *packet = NULL, *writer_packet = NULL; + const bt_event_class *event_class = NULL; + const bt_event *writer_event = NULL; + const bt_packet *packet = NULL, *writer_packet = NULL; const char *event_name; int int_ret; event_class = bt_event_get_class(event); - assert(event_class); + BT_ASSERT(event_class); event_name = bt_event_class_get_name(event_class); @@ -240,14 +240,14 @@ struct bt_event *trimmer_output_event( } packet = bt_event_get_packet(event); - assert(packet); + BT_ASSERT(packet); writer_packet = lookup_packet(trim_it, packet); if (!writer_packet) { BT_LOGE_STR("Failed to find existing packet."); goto error; } - bt_get(writer_packet); + bt_packet_get_ref(writer_packet); int_ret = bt_event_set_packet(writer_event, writer_packet); if (int_ret < 0) { @@ -261,10 +261,10 @@ struct bt_event *trimmer_output_event( goto end; error: - BT_PUT(writer_event); + BT_OBJECT_PUT_REF_AND_RESET(writer_event); end: - bt_put(writer_packet); - bt_put(packet); - bt_put(event_class); + bt_packet_put_ref(writer_packet); + bt_packet_put_ref(packet); + bt_event_class_put_ref(event_class); return writer_event; }