.seek = medop_seek,
};
+static
+struct ctf_fs_ds_index_entry *ctf_fs_ds_index_entry_create(
+ bt_self_component *self_comp, bt_logging_level log_level)
+{
+ struct ctf_fs_ds_index_entry *entry;
+
+ entry = g_new0(struct ctf_fs_ds_index_entry, 1);
+ if (!entry) {
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to allocate a ctf_fs_ds_index_entry.");
+ goto end;
+ }
+
+ entry->packet_seq_num = UINT64_MAX;
+
+end:
+ return entry;
+}
+
static
int convert_cycles_to_ns(struct ctf_clock_class *clock_class,
uint64_t cycles, int64_t *ns)
static
struct ctf_fs_ds_index *build_index_from_idx_file(
struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *file_info)
+ struct ctf_fs_ds_file_info *file_info,
+ struct ctf_msg_iter *msg_iter)
{
int ret;
gchar *directory = NULL;
BT_COMP_LOGI("Building index from .idx file of stream file %s",
ds_file->file->path->str);
- ret = ctf_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
+ ret = ctf_msg_iter_get_packet_properties(msg_iter, &props);
if (ret) {
BT_COMP_LOGI_STR("Cannot read first packet's header and context fields.");
goto error;
goto error;
}
- index_entry = g_new0(struct ctf_fs_ds_index_entry, 1);
+ index_entry = ctf_fs_ds_index_entry_create(
+ ds_file->self_comp, ds_file->log_level);
if (!index_entry) {
+ BT_COMP_LOGE_APPEND_CAUSE(ds_file->self_comp,
+ "Failed to create a ctf_fs_ds_index_entry.");
goto error;
}
goto error;
}
+ if (version_minor >= 1) {
+ index_entry->packet_seq_num = be64toh(file_index->packet_seq_num);
+ }
+
total_packets_size += packet_size;
file_pos += file_index_entry_size;
static
struct ctf_fs_ds_index *build_index_from_stream_file(
struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *file_info)
+ struct ctf_fs_ds_file_info *file_info,
+ struct ctf_msg_iter *msg_iter)
{
int ret;
struct ctf_fs_ds_index *index = NULL;
break;
}
- iter_status = ctf_msg_iter_seek(ds_file->msg_iter,
+ iter_status = ctf_msg_iter_seek(msg_iter,
current_packet_offset_bytes);
if (iter_status != CTF_MSG_ITER_STATUS_OK) {
goto error;
}
iter_status = ctf_msg_iter_get_packet_properties(
- ds_file->msg_iter, &props);
+ msg_iter, &props);
if (iter_status != CTF_MSG_ITER_STATUS_OK) {
goto error;
}
goto error;
}
- index_entry = g_new0(struct ctf_fs_ds_index_entry, 1);
+ index_entry = ctf_fs_ds_index_entry_create(
+ ds_file->self_comp, ds_file->log_level);
if (!index_entry) {
- BT_COMP_LOGE_STR("Failed to allocate a new index entry.");
+ BT_COMP_LOGE_APPEND_CAUSE(ds_file->self_comp,
+ "Failed to create a ctf_fs_ds_index_entry.");
goto error;
}
struct ctf_fs_ds_file *ctf_fs_ds_file_create(
struct ctf_fs_trace *ctf_fs_trace,
bt_self_message_iterator *self_msg_iter,
- struct ctf_msg_iter *msg_iter,
bt_stream *stream, const char *path,
bt_logging_level log_level)
{
goto error;
}
- ds_file->msg_iter = msg_iter;
- ctf_msg_iter_set_medops_data(ds_file->msg_iter, ds_file);
- if (!ds_file->msg_iter) {
- goto error;
- }
-
ds_file->mmap_max_len = offset_align * 2048;
goto end;
BT_HIDDEN
struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
struct ctf_fs_ds_file *ds_file,
- struct ctf_fs_ds_file_info *file_info)
+ struct ctf_fs_ds_file_info *file_info,
+ struct ctf_msg_iter *msg_iter)
{
struct ctf_fs_ds_index *index;
bt_self_component *self_comp = ds_file->self_comp;
bt_logging_level log_level = ds_file->log_level;
- index = build_index_from_idx_file(ds_file, file_info);
+ index = build_index_from_idx_file(ds_file, file_info, msg_iter);
if (index) {
goto end;
}
BT_COMP_LOGI("Failed to build index from .index file; "
"falling back to stream indexing.");
- index = build_index_from_stream_file(ds_file, file_info);
+ index = build_index_from_stream_file(ds_file, file_info, msg_iter);
end:
return index;
}
BT_HIDDEN
bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next(
- struct ctf_fs_ds_file *ds_file,
+ struct ctf_msg_iter *msg_iter,
bt_message **msg)
{
enum ctf_msg_iter_status msg_iter_status;
bt_component_class_message_iterator_next_method_status status;
- msg_iter_status = ctf_msg_iter_get_next_message(
- ds_file->msg_iter, msg);
+ msg_iter_status = ctf_msg_iter_get_next_message(msg_iter, msg);
switch (msg_iter_status) {
case CTF_MSG_ITER_STATUS_EOF: