#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"
struct ctf_msg_iter *msg_iter)
{
int ret;
- gchar *directory = NULL;
- gchar *basename = NULL;
- GString *index_basename = NULL;
- gchar *index_file_path = NULL;
- GMappedFile *mapped_file = NULL;
+ bt2c::GCharUP directory;
+ bt2c::GCharUP basename;
+ std::string index_basename;
+ bt2c::GCharUP index_file_path;
+ bt2c::GMappedFileUP mapped_file;
gsize filesize;
const char *mmap_begin = NULL, *file_pos = NULL;
const struct ctf_packet_index_file_hdr *header = 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.reset(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;
}
* Traces with such large indexes have never been seen in the wild,
* but this would need to be adjusted to support them.
*/
- filesize = g_mapped_file_get_length(mapped_file);
+ filesize = g_mapped_file_get_length(mapped_file.get());
if (filesize < sizeof(*header)) {
BT_CPPLOGW_SPEC(ds_file->logger,
"Invalid LTTng trace index file: "
goto error;
}
- mmap_begin = g_mapped_file_get_contents(mapped_file);
+ mmap_begin = g_mapped_file_get_contents(mapped_file.get());
header = (struct ctf_packet_index_file_hdr *) mmap_begin;
- file_pos = g_mapped_file_get_contents(mapped_file) + sizeof(*header);
+ file_pos = g_mapped_file_get_contents(mapped_file.get()) + sizeof(*header);
if (be32toh(header->magic) != CTF_INDEX_MAGIC) {
BT_CPPLOGW_STR_SPEC(ds_file->logger,
"Invalid LTTng trace index: \"magic\" field validation failed");
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);
- }
return index;
error:
index.reset();
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;
auto ds_file = bt2s::make_unique<ctf_fs_ds_file>(parentLogger);
size_t offset_align;
- 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.get();
ds_file->file->path = path;
return index;
}
-ctf_fs_ds_index::UP ctf_fs_ds_index_create()
-{
- return bt2s::make_unique<ctf_fs_ds_index>();
-}
-
ctf_fs_ds_file::~ctf_fs_ds_file()
{
(void) ds_file_munmap(this);