From f9b673b02fecd39865c329164af04e634cc3872b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 6 Dec 2023 21:31:48 +0000 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 Reviewed-on: https://review.lttng.org/c/babeltrace/+/12361 Tested-by: jenkins --- src/plugins/ctf/fs-src/data-stream-file.cpp | 11 ++--------- src/plugins/ctf/fs-src/data-stream-file.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp index e4bebf9f..22aa309f 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.cpp +++ b/src/plugins/ctf/fs-src/data-stream-file.cpp @@ -506,11 +506,7 @@ build_index_from_idx_file(struct ctf_fs_ds_file *ds_file, struct ctf_fs_ds_file_ return bt2s::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) { @@ -656,10 +652,7 @@ build_index_from_stream_file(struct ctf_fs_ds_file *ds_file, struct ctf_fs_ds_fi return bt2s::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, 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 e00a5cc4..05a6db13 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.hpp +++ b/src/plugins/ctf/fs-src/data-stream-file.hpp @@ -78,15 +78,15 @@ struct ctf_fs_ds_file struct ctf_fs_ds_index_entry { - explicit ctf_fs_ds_index_entry(const bt2c::DataLen offsetParam, - const bt2c::DataLen packetSizeParam) noexcept : - offset(offsetParam), - packetSize(packetSizeParam) + ctf_fs_ds_index_entry(const bt2c::CStringView pathParam, const bt2c::DataLen offsetParam, + const bt2c::DataLen packetSizeParam) noexcept : + 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. */ bt2c::DataLen offset; -- 2.34.1