#include "compat/endian.h" /* IWYU pragma: keep */
#include "compat/mman.h" /* IWYU: pragma keep */
+#include "cpp-common/bt2c/glib-up.hpp"
#include "cpp-common/bt2s/make-unique.hpp"
#include "cpp-common/vendor/fmt/format.h"
/*
* File we are currently reading. Changes whenever we switch to
* reading another data file.
- *
- * Owned by this.
*/
- struct ctf_fs_ds_file *file = nullptr;
+ ctf_fs_ds_file::UP file;
/* Weak, for context / logging / appending causes. */
bt_self_message_iterator *self_msg_iter = nullptr;
struct ctf_fs_ds_group_medops_data *data = (struct ctf_fs_ds_group_medops_data *) void_data;
/* Return bytes from the current file. */
- return medop_request_bytes(request_sz, buffer_addr, buffer_sz, data->file);
+ return medop_request_bytes(request_sz, buffer_addr, buffer_sz, data->file.get());
}
static bt_stream *medop_group_borrow_stream(bt_stream_class *stream_class, int64_t stream_id,
{
struct ctf_fs_ds_group_medops_data *data = (struct ctf_fs_ds_group_medops_data *) void_data;
- return medop_borrow_stream(stream_class, stream_id, data->file);
+ return medop_borrow_stream(stream_class, stream_id, data->file.get());
}
/*
/* Check if that file is already the one mapped. */
if (!data->file || data->file->file->path != index_entry->path) {
- /* Destroy the previously used file. */
- ctf_fs_ds_file_destroy(data->file);
-
/* Create the new file. */
data->file =
ctf_fs_ds_file_create(data->ds_file_group->ctf_fs_trace, data->ds_file_group->stream,
* Ensure the right portion of the file will be returned on the next
* request_bytes call.
*/
- status = ds_file_mmap(data->file, index_entry->offset.bytes());
+ status = ds_file_mmap(data->file.get(), index_entry->offset.bytes());
if (status != CTF_MSG_ITER_MEDIUM_STATUS_OK) {
goto end;
}
return status;
}
-void ctf_fs_ds_group_medops_data_destroy(struct ctf_fs_ds_group_medops_data *data)
+void ctf_fs_ds_group_medops_data_deleter::operator()(ctf_fs_ds_group_medops_data *data) noexcept
{
- if (!data) {
- goto end;
- }
-
- ctf_fs_ds_file_destroy(data->file);
-
delete data;
-
-end:
- return;
}
enum ctf_msg_iter_medium_status ctf_fs_ds_group_medops_data_create(
struct ctf_fs_ds_file_group *ds_file_group, bt_self_message_iterator *self_msg_iter,
- const bt2c::Logger& parentLogger, struct ctf_fs_ds_group_medops_data **out)
+ const bt2c::Logger& parentLogger, ctf_fs_ds_group_medops_data_up& out)
{
BT_ASSERT(self_msg_iter);
BT_ASSERT(ds_file_group);
BT_ASSERT(ds_file_group->index);
BT_ASSERT(!ds_file_group->index->entries.empty());
- ctf_fs_ds_group_medops_data *data = new ctf_fs_ds_group_medops_data {parentLogger};
- data->ds_file_group = ds_file_group;
- data->self_msg_iter = self_msg_iter;
+ out.reset(new ctf_fs_ds_group_medops_data {parentLogger});
+
+ out->ds_file_group = ds_file_group;
+ out->self_msg_iter = self_msg_iter;
/*
* No need to prepare the first file. ctf_msg_iter will call
* done then.
*/
- *out = data;
return CTF_MSG_ITER_MEDIUM_STATUS_OK;
}
struct ctf_msg_iter *msg_iter)
{
int ret;
- gchar *directory = NULL;
- gchar *basename = NULL;
- GString *index_basename = NULL;
- gchar *index_file_path = NULL;
+ bt2c::GCharUP directory;
+ bt2c::GCharUP basename;
+ std::string index_basename;
+ bt2c::GCharUP index_file_path;
GMappedFile *mapped_file = NULL;
gsize filesize;
const char *mmap_begin = NULL, *file_pos = NULL;
}
/* Look for index file in relative path index/name.idx. */
- basename = g_path_get_basename(ds_file->file->path.c_str());
+ basename.reset(g_path_get_basename(ds_file->file->path.c_str()));
if (!basename) {
BT_CPPLOGE_SPEC(ds_file->logger, "Cannot get the basename of datastream file {}",
ds_file->file->path);
goto error;
}
- directory = g_path_get_dirname(ds_file->file->path.c_str());
+ directory.reset(g_path_get_dirname(ds_file->file->path.c_str()));
if (!directory) {
BT_CPPLOGE_SPEC(ds_file->logger, "Cannot get dirname of datastream file {}",
ds_file->file->path);
goto error;
}
- index_basename = g_string_new(basename);
- if (!index_basename) {
- BT_CPPLOGE_STR_SPEC(ds_file->logger, "Cannot allocate index file basename string");
- goto error;
- }
-
- g_string_append(index_basename, ".idx");
- index_file_path = g_build_filename(directory, "index", index_basename->str, NULL);
- mapped_file = g_mapped_file_new(index_file_path, FALSE, NULL);
+ index_basename = fmt::format("{}.idx", basename.get());
+ index_file_path.reset(g_build_filename(directory.get(), "index", index_basename.c_str(), NULL));
+ mapped_file = g_mapped_file_new(index_file_path.get(), FALSE, NULL);
if (!mapped_file) {
- BT_CPPLOGD_SPEC(ds_file->logger, "Cannot create new mapped file {}", index_file_path);
+ BT_CPPLOGD_SPEC(ds_file->logger, "Cannot create new mapped file {}", index_file_path.get());
goto error;
}
goto error;
}
- index = ctf_fs_ds_index_create();
- if (!index) {
- goto error;
- }
+ index = bt2s::make_unique<ctf_fs_ds_index>();
for (i = 0; i < file_entry_count; i++) {
struct ctf_packet_index *file_index = (struct ctf_packet_index *) file_pos;
goto error;
}
end:
- g_free(directory);
- g_free(basename);
- g_free(index_file_path);
- if (index_basename) {
- g_string_free(index_basename, TRUE);
- }
if (mapped_file) {
g_mapped_file_unref(mapped_file);
}
struct ctf_msg_iter *msg_iter)
{
int ret;
- ctf_fs_ds_index::UP index;
enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK;
auto currentPacketOffset = bt2c::DataLen::fromBytes(0);
BT_CPPLOGI_SPEC(ds_file->logger, "Indexing stream file {}", ds_file->file->path);
- index = ctf_fs_ds_index_create();
- if (!index) {
- goto error;
- }
+ ctf_fs_ds_index::UP index = bt2s::make_unique<ctf_fs_ds_index>();
while (true) {
struct ctf_msg_iter_packet_properties props;
goto end;
}
-struct ctf_fs_ds_file *ctf_fs_ds_file_create(struct ctf_fs_trace *ctf_fs_trace,
- bt2::Stream::Shared stream, const char *path,
- const bt2c::Logger& parentLogger)
+ctf_fs_ds_file::UP ctf_fs_ds_file_create(struct ctf_fs_trace *ctf_fs_trace,
+ bt2::Stream::Shared stream, const char *path,
+ const bt2c::Logger& parentLogger)
{
int ret;
+ auto ds_file = bt2s::make_unique<ctf_fs_ds_file>(parentLogger);
size_t offset_align;
- ctf_fs_ds_file *ds_file = new ctf_fs_ds_file {parentLogger};
-
- if (!ds_file) {
- goto error;
- }
-
- ds_file->file = ctf_fs_file_create(parentLogger);
- if (!ds_file->file) {
- goto error;
- }
+ ds_file->file = bt2s::make_unique<ctf_fs_file>(parentLogger);
ds_file->stream = std::move(stream);
- ds_file->metadata = ctf_fs_trace->metadata;
+ ds_file->metadata = ctf_fs_trace->metadata.get();
ds_file->file->path = path;
ret = ctf_fs_file_open(ds_file->file.get(), "rb");
if (ret) {
error:
/* Do not touch "borrowed" file. */
- ctf_fs_ds_file_destroy(ds_file);
- ds_file = NULL;
+ ds_file.reset();
end:
return ds_file;
return index;
}
-ctf_fs_ds_index::UP ctf_fs_ds_index_create()
-{
- return bt2s::make_unique<ctf_fs_ds_index>();
-}
-
-void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
+ctf_fs_ds_file::~ctf_fs_ds_file()
{
- if (!ds_file) {
- return;
- }
-
- (void) ds_file_munmap(ds_file);
-
- delete ds_file;
+ (void) ds_file_munmap(this);
}
ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns)
projects / babeltrace.git / blobdiff