From 2f2c4a48fe2fb0d2a9c091fa6c55109fa88f78f2 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 21 Jun 2022 15:53:47 -0400 Subject: [PATCH] src.ctf.fs: pass path to ctf_fs_ds_index_entry constructor Change-Id: Id8c29f502cc126775e2ded67813a6f8714f06705 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8436 Reviewed-by: Philippe Proulx --- src/plugins/ctf/fs-src/data-stream-file.cpp | 12 +++--------- src/plugins/ctf/fs-src/data-stream-file.hpp | 8 +++++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp index e5b9791b8..9e56a0f0e 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.cpp +++ b/src/plugins/ctf/fs-src/data-stream-file.cpp @@ -516,11 +516,7 @@ build_index_from_idx_file(struct ctf_fs_ds_file *ds_file, struct ctf_fs_ds_file_ return nonstd::nullopt; } - ctf_fs_ds_index_entry index_entry {offset, packetSize}; - - /* Set path to stream file. */ - index_entry.path = file_info->path.c_str(); - + ctf_fs_ds_index_entry index_entry {file_info->path.c_str(), offset, packetSize}; index_entry.timestamp_begin = be64toh(file_index->timestamp_begin); index_entry.timestamp_end = be64toh(file_index->timestamp_end); if (index_entry.timestamp_end < index_entry.timestamp_begin) { @@ -662,10 +658,8 @@ build_index_from_stream_file(struct ctf_fs_ds_file *ds_file, struct ctf_fs_ds_fi return nonstd::nullopt; } - ctf_fs_ds_index_entry index_entry {currentPacketOffset, currentPacketSize}; - - /* Set path to stream file. */ - index_entry.path = file_info->path.c_str(); + ctf_fs_ds_index_entry index_entry {file_info->path.c_str(), currentPacketOffset, + currentPacketSize}; int ret = init_index_entry(index_entry, ds_file, &props); if (ret) { diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp index e1e7aa593..37dc18739 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.hpp +++ b/src/plugins/ctf/fs-src/data-stream-file.hpp @@ -83,13 +83,15 @@ struct ctf_fs_ds_file struct ctf_fs_ds_index_entry { - ctf_fs_ds_index_entry(bt2_common::DataLen offsetParam, bt2_common::DataLen packetSizeParam) : - offset(offsetParam), packetSize(packetSizeParam) + ctf_fs_ds_index_entry(const char *pathParam, bt2_common::DataLen offsetParam, + bt2_common::DataLen packetSizeParam) : + path {pathParam}, + offset {offsetParam}, packetSize {packetSizeParam} { } /* Weak, belongs to ctf_fs_ds_file_info. */ - const char *path = nullptr; + const char *path; /* Position of the packet from the beginning of the file. */ bt2_common::DataLen offset; -- 2.34.1