ctf_msg_iter_packet_properties props;
int ret = ctf_msg_iter_get_packet_properties(msg_iter, &props);
if (ret) {
- BT_CPPLOGI_STR_SPEC(ds_file->logger,
- "Cannot read first packet's header and context fields.");
+ BT_CPPLOGI_SPEC(ds_file->logger, "Cannot read first packet's header and context fields.");
return bt2s::nullopt;
}
ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, props.stream_class_id);
BT_ASSERT(sc);
if (!sc->default_clock_class) {
- BT_CPPLOGI_STR_SPEC(ds_file->logger, "Cannot find stream class's default clock class.");
+ BT_CPPLOGI_SPEC(ds_file->logger, "Cannot find stream class's default clock class.");
return bt2s::nullopt;
}
const char *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");
+ BT_CPPLOGW_SPEC(ds_file->logger,
+ "Invalid LTTng trace index: \"magic\" field validation failed");
return bt2s::nullopt;
}
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) {
ret = convert_cycles_to_ns(sc->default_clock_class, index_entry.timestamp_begin,
&index_entry.timestamp_begin_ns);
if (ret) {
- BT_CPPLOGI_STR_SPEC(
+ BT_CPPLOGI_SPEC(
ds_file->logger,
"Failed to convert raw timestamp to nanoseconds since Epoch during index parsing");
return bt2s::nullopt;
ret = convert_cycles_to_ns(sc->default_clock_class, index_entry.timestamp_end,
&index_entry.timestamp_end_ns);
if (ret) {
- BT_CPPLOGI_STR_SPEC(
+ BT_CPPLOGI_SPEC(
ds_file->logger,
"Failed to convert raw timestamp to nanoseconds since Epoch during LTTng trace index parsing");
return bt2s::nullopt;
int ret = convert_cycles_to_ns(sc->default_clock_class, props->snapshots.beginning_clock,
&entry.timestamp_begin_ns);
if (ret) {
- BT_CPPLOGI_STR_SPEC(ds_file->logger,
- "Failed to convert raw timestamp to nanoseconds since Epoch.");
+ BT_CPPLOGI_SPEC(ds_file->logger,
+ "Failed to convert raw timestamp to nanoseconds since Epoch.");
return ret;
}
} else {
int ret = convert_cycles_to_ns(sc->default_clock_class, props->snapshots.end_clock,
&entry.timestamp_end_ns);
if (ret) {
- BT_CPPLOGI_STR_SPEC(ds_file->logger,
- "Failed to convert raw timestamp to nanoseconds since Epoch.");
+ BT_CPPLOGI_SPEC(ds_file->logger,
+ "Failed to convert raw timestamp to nanoseconds since Epoch.");
return ret;
}
} else {
struct ctf_msg_iter_packet_properties props;
if (currentPacketOffset.bytes() > ds_file->file->size) {
- BT_CPPLOGE_STR_SPEC(ds_file->logger,
- "Unexpected current packet's offset (larger than file).");
+ BT_CPPLOGE_SPEC(ds_file->logger,
+ "Unexpected current packet's offset (larger than file).");
return bt2s::nullopt;
} else if (currentPacketOffset.bytes() == ds_file->file->size) {
/* No more data */
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) {