Introduce ctf_fs_ds_index::UP, a unique_ptr with a deleter that calls
ctf_fs_ds_index_destroy. Make ctf_fs_ds_index_create (and the
other functions creating an index in data-stream-file.cpp) return it.
Change-Id: Id04124aeaff3384e566a43fbbd6c1fedd2bf9bc3
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8251
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12289
clock_class->offset_cycles, ns);
}
clock_class->offset_cycles, ns);
}
-static struct ctf_fs_ds_index *build_index_from_idx_file(struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *file_info,
- struct ctf_msg_iter *msg_iter)
+static ctf_fs_ds_index::UP build_index_from_idx_file(struct ctf_fs_ds_file *ds_file,
+ struct ctf_fs_ds_file_info *file_info,
+ struct ctf_msg_iter *msg_iter)
{
int ret;
gchar *directory = NULL;
{
int ret;
gchar *directory = NULL;
gsize filesize;
const char *mmap_begin = NULL, *file_pos = NULL;
const struct ctf_packet_index_file_hdr *header = NULL;
gsize filesize;
const char *mmap_begin = NULL, *file_pos = NULL;
const struct ctf_packet_index_file_hdr *header = NULL;
- struct ctf_fs_ds_index *index = NULL;
+ ctf_fs_ds_index::UP index;
struct ctf_fs_ds_index_entry *index_entry = NULL, *prev_index_entry = NULL;
auto totalPacketsSize = bt2c::DataLen::fromBytes(0);
size_t file_index_entry_size;
struct ctf_fs_ds_index_entry *index_entry = NULL, *prev_index_entry = NULL;
auto totalPacketsSize = bt2c::DataLen::fromBytes(0);
size_t file_index_entry_size;
- ctf_fs_ds_index_destroy(index);
ctf_fs_ds_index_entry_destroy(index_entry);
ctf_fs_ds_index_entry_destroy(index_entry);
-static struct ctf_fs_ds_index *build_index_from_stream_file(struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *file_info,
- struct ctf_msg_iter *msg_iter)
+static ctf_fs_ds_index::UP build_index_from_stream_file(struct ctf_fs_ds_file *ds_file,
+ struct ctf_fs_ds_file_info *file_info,
+ struct ctf_msg_iter *msg_iter)
- struct ctf_fs_ds_index *index = NULL;
+ ctf_fs_ds_index::UP index;
enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK;
auto currentPacketOffset = bt2c::DataLen::fromBytes(0);
enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK;
auto currentPacketOffset = bt2c::DataLen::fromBytes(0);
- ctf_fs_ds_index_destroy(index);
- index = NULL;
-struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *file_info,
- struct ctf_msg_iter *msg_iter)
+ctf_fs_ds_index::UP ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_file,
+ struct ctf_fs_ds_file_info *file_info,
+ struct ctf_msg_iter *msg_iter)
- struct ctf_fs_ds_index *index;
-
- index = build_index_from_idx_file(ds_file, file_info, msg_iter);
+ auto index = build_index_from_idx_file(ds_file, file_info, msg_iter);
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(const bt2c::Logger& logger)
+ctf_fs_ds_index::UP ctf_fs_ds_index_create(const bt2c::Logger& logger)
- ctf_fs_ds_index *index = new ctf_fs_ds_index;
+ ctf_fs_ds_index::UP index {new ctf_fs_ds_index};
+
index->entries = g_ptr_array_new_with_free_func((GDestroyNotify) ctf_fs_ds_index_entry_destroy);
if (!index->entries) {
BT_CPPLOGE_SPEC(logger, "Failed to allocate index entries.");
index->entries = g_ptr_array_new_with_free_func((GDestroyNotify) ctf_fs_ds_index_entry_destroy);
if (!index->entries) {
BT_CPPLOGE_SPEC(logger, "Failed to allocate index entries.");
- ctf_fs_ds_index_destroy(index);
- index = NULL;
+void ctf_fs_ds_index_deleter::operator()(ctf_fs_ds_index * const index) noexcept
+{
+ ctf_fs_ds_index_destroy(index);
+}
+
ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns)
{
ctf_fs_ds_file_info::UP ds_file_info = bt2s::make_unique<ctf_fs_ds_file_info>();
ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns)
{
ctf_fs_ds_file_info::UP ds_file_info = bt2s::make_unique<ctf_fs_ds_file_info>();
uint64_t packet_seq_num = 0;
};
uint64_t packet_seq_num = 0;
};
+struct ctf_fs_ds_index_deleter
+{
+ void operator()(struct ctf_fs_ds_index *index) noexcept;
+};
+
+ using UP = std::unique_ptr<ctf_fs_ds_index, ctf_fs_ds_index_deleter>;
+
/* Array of pointer to struct ctf_fs_ds_index_entry. */
GPtrArray *entries = nullptr;
};
/* Array of pointer to struct ctf_fs_ds_index_entry. */
GPtrArray *entries = nullptr;
};
void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
-struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *ds_file_info,
- struct ctf_msg_iter *msg_iter);
+ctf_fs_ds_index::UP ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_file,
+ struct ctf_fs_ds_file_info *ds_file_info,
+ struct ctf_msg_iter *msg_iter);
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(const bt2c::Logger& logger);
+ctf_fs_ds_index::UP ctf_fs_ds_index_create(const bt2c::Logger& logger);
void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
- index = ctf_fs_ds_file_build_index(ds_file, ds_file_info.get(), msg_iter);
+ index = ctf_fs_ds_file_build_index(ds_file, ds_file_info.get(), msg_iter).release();
if (!index) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'",
ds_file->file->path->str);
if (!index) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'",
ds_file->file->path->str);
*/
if (!dest_group) {
struct ctf_stream_class *sc;
*/
if (!dest_group) {
struct ctf_stream_class *sc;
- struct ctf_fs_ds_index *index;
sc = ctf_trace_class_borrow_stream_class_by_id(dest_trace->metadata->tc,
src_group->sc->id);
BT_ASSERT(sc);
sc = ctf_trace_class_borrow_stream_class_by_id(dest_trace->metadata->tc,
src_group->sc->id);
BT_ASSERT(sc);
- index = ctf_fs_ds_index_create(dest_trace->logger);
+ auto index = ctf_fs_ds_index_create(dest_trace->logger).release();
if (!index) {
ret = -1;
goto end;
if (!index) {
ret = -1;
goto end;