summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6d4acae)
Introduce ctf_fs_msg_iter_data::UP and use it in ctf_fs_iterator_init
and ctf_fs_iterator_finalize.
Change-Id: I448cedc164d93f9ba26da5640578889b0fff580c
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8279
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12317
Tested-by: jenkins <jenkins@lttng.org>
-static void ctf_fs_msg_iter_data_destroy(struct ctf_fs_msg_iter_data *msg_iter_data)
-{
- if (!msg_iter_data) {
- return;
- }
-
- delete msg_iter_data;
-}
-
static bt_message_iterator_class_next_method_status
ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
{
static bt_message_iterator_class_next_method_status
ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
{
void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
{
void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
{
- ctf_fs_msg_iter_data_destroy(
- (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it));
+ ctf_fs_msg_iter_data::UP {
+ (static_cast<ctf_fs_msg_iter_data *>(bt_self_message_iterator_get_data(it)))};
}
static bt_message_iterator_class_initialize_method_status
}
static bt_message_iterator_class_initialize_method_status
bt_self_component_port_output_as_self_component_port(self_port));
BT_ASSERT(port_data);
bt_self_component_port_output_as_self_component_port(self_port));
BT_ASSERT(port_data);
- ctf_fs_msg_iter_data *msg_iter_data = new ctf_fs_msg_iter_data {self_msg_iter};
+ auto msg_iter_data = bt2s::make_unique<ctf_fs_msg_iter_data>(self_msg_iter);
msg_iter_data->ds_file_group = port_data->ds_file_group;
medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group,
msg_iter_data->ds_file_group = port_data->ds_file_group;
medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group,
bt_self_message_iterator_configuration_set_can_seek_forward(config, true);
}
bt_self_message_iterator_configuration_set_can_seek_forward(config, true);
}
- bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data);
- msg_iter_data = NULL;
+ bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release());
status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
goto end;
status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
goto end;
bt_self_message_iterator_set_data(self_msg_iter, NULL);
end:
bt_self_message_iterator_set_data(self_msg_iter, NULL);
end:
- ctf_fs_msg_iter_data_destroy(msg_iter_data);
return status;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
return status;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
struct ctf_fs_msg_iter_data
{
struct ctf_fs_msg_iter_data
{
+ using UP = std::unique_ptr<ctf_fs_msg_iter_data>;
+
explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
"PLUGIN/SRC.CTF.FS/MSG-ITER"}
explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
"PLUGIN/SRC.CTF.FS/MSG-ITER"}