#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.");
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,
+bt_component_status update_packet_context_field(FILE *err,
+ 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_class *struct_class = NULL, *field_class = NULL;
- struct bt_field *field = NULL, *writer_field = NULL;
+ bt_component_status ret;
+ 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);
goto error;
}
if (strcmp(field_name, name)) {
- BT_PUT(field_class);
- BT_PUT(field);
+ BT_OBJECT_PUT_REF_AND_RESET(field_class);
+ BT_OBJECT_PUT_REF_AND_RESET(field);
continue;
}
if (bt_field_class_id(field_class) !=
int_ret = bt_field_unsigned_integer_set_value(writer_field, value);
BT_ASSERT(int_ret == 0);
- BT_PUT(writer_field);
- BT_PUT(field_class);
- 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_class);
- 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_class);
- 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);
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);
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);
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) {
}
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;
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) {
goto error;
}
- /* We keep the reference on the writer_event to create a notification. */
+ /* We keep the reference on the writer_event to create a message. */
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;
}