msg_iter_data->ds_file_group->ds_file_infos,
msg_iter_data->ds_file_info_index);
+ /* Destroy the previous ds file. */
ctf_fs_ds_file_destroy(msg_iter_data->ds_file);
+
+ /* Create the new ds file. */
msg_iter_data->ds_file = ctf_fs_ds_file_create(
msg_iter_data->ds_file_group->ctf_fs_trace,
msg_iter_data->self_msg_iter,
- msg_iter_data->msg_iter,
msg_iter_data->ds_file_group->stream,
ds_file_info->path->str,
msg_iter_data->log_level);
ret = -1;
}
+ /* Tell the ctf message iterator to iterate on the new ds file. */
+ ctf_msg_iter_set_medops_data(msg_iter_data->msg_iter,
+ msg_iter_data->ds_file);
+
return ret;
}
struct ctf_fs_msg_iter_data *msg_iter_data)
{
ctf_msg_iter_set_emit_stream_beginning_message(
- msg_iter_data->ds_file->msg_iter,
+ msg_iter_data->msg_iter,
msg_iter_data->ds_file_info_index == 0);
ctf_msg_iter_set_emit_stream_end_message(
- msg_iter_data->ds_file->msg_iter,
+ msg_iter_data->msg_iter,
msg_iter_data->ds_file_info_index ==
msg_iter_data->ds_file_group->ds_file_infos->len - 1);
}
while (true) {
bt_message *msg;
- status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &msg);
+ status = ctf_fs_ds_file_next(msg_iter_data->msg_iter, &msg);
switch (status) {
case BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK:
*out_msg = msg;
array_insert(ds_file_group->ds_file_infos, ds_file_info, i);
}
+static
+bool ds_index_entries_equal(
+ const struct ctf_fs_ds_index_entry *left,
+ const struct ctf_fs_ds_index_entry *right)
+{
+ if (left->packet_size != right->packet_size) {
+ return false;
+ }
+
+ if (left->timestamp_begin != right->timestamp_begin) {
+ return false;
+ }
+
+ if (left->timestamp_end != right->timestamp_end) {
+ return false;
+ }
+
+ if (left->packet_seq_num != right->packet_seq_num) {
+ return false;
+ }
+
+ return true;
+}
+
+/*
+ * Insert `entry` into `index`, without duplication.
+ *
+ * The entry is inserted only if there isn't an identical entry already.
+ *
+ * In any case, the ownership of `entry` is transferred to this function. So if
+ * the entry is not inserted, it is freed.
+ */
+
static
void ds_index_insert_ds_index_entry_sorted(
struct ctf_fs_ds_index *index,
struct ctf_fs_ds_index_entry *entry)
{
guint i;
+ struct ctf_fs_ds_index_entry *other_entry;
/* Find the spot where to insert this index entry. */
for (i = 0; i < index->entries->len; i++) {
- struct ctf_fs_ds_index_entry *other_entry =
- g_ptr_array_index(index->entries, i);
+ other_entry = g_ptr_array_index(index->entries, i);
- if (entry->timestamp_begin_ns < other_entry->timestamp_begin_ns) {
+ if (entry->timestamp_begin_ns <= other_entry->timestamp_begin_ns) {
break;
}
}
- array_insert(index->entries, entry, i);
+ /*
+ * Insert the entry only if a duplicate doesn't already exist.
+ *
+ * There can be duplicate packets if reading multiple overlapping
+ * snapshots of the same trace. We then want the index to contain
+ * a reference to only one copy of that packet.
+ */
+ if (i == index->entries->len ||
+ !ds_index_entries_equal(entry, other_entry)) {
+ array_insert(index->entries, entry, i);
+ } else {
+ g_free(entry);
+ }
}
static
/*
* Ownership of the ctf_fs_ds_index_entry is transferred to
- * dest.
+ * ds_index_insert_ds_index_entry_sorted.
*/
g_ptr_array_index(src->entries, i) = NULL;
-
ds_index_insert_ds_index_entry_sorted(dest, entry);
}
}
bt_self_component *self_comp = ctf_fs_trace->self_comp;
bt_self_component_class *self_comp_class = ctf_fs_trace->self_comp_class;
+ /*
+ * Create a temporary ds_file to read some properties about the data
+ * stream file.
+ */
+ ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, NULL, path,
+ log_level);
+ if (!ds_file) {
+ goto error;
+ }
+
+ /* Create a temporary iterator to read the ds_file. */
msg_iter = ctf_msg_iter_create(ctf_fs_trace->metadata->tc,
bt_common_get_page_size(log_level) * 8,
- ctf_fs_ds_file_medops, NULL, log_level, self_comp, NULL);
+ ctf_fs_ds_file_medops, ds_file, log_level, self_comp, NULL);
if (!msg_iter) {
BT_COMP_LOGE_STR("Cannot create a CTF message iterator.");
goto error;
}
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter,
- NULL, path, log_level);
- if (!ds_file) {
- goto error;
- }
-
- 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_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
"Cannot get stream file's first packet's header and context fields (`%s`).",
goto error;
}
- index = ctf_fs_ds_file_build_index(ds_file, ds_file_info);
+ index = ctf_fs_ds_file_build_index(ds_file, ds_file_info, msg_iter);
if (!index) {
BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
self_comp, self_comp_class,
int ret = 0;
BT_ASSERT(ctf_fs_trace);
+ BT_ASSERT(index_entry);
+ BT_ASSERT(index_entry->path);
+
+ ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL,
+ NULL, index_entry->path, log_level);
+ if (!ds_file) {
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to create a ctf_fs_ds_file");
+ ret = -1;
+ goto end;
+ }
+
BT_ASSERT(ctf_fs_trace->metadata);
BT_ASSERT(ctf_fs_trace->metadata->tc);
msg_iter = ctf_msg_iter_create(ctf_fs_trace->metadata->tc,
bt_common_get_page_size(log_level) * 8, ctf_fs_ds_file_medops,
- NULL, log_level, self_comp, NULL);
+ ds_file, log_level, self_comp, NULL);
if (!msg_iter) {
/* ctf_msg_iter_create() logs errors. */
ret = -1;
goto end;
}
- BT_ASSERT(index_entry);
- BT_ASSERT(index_entry->path);
-
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter,
- NULL, index_entry->path, log_level);
- if (!ds_file) {
- BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to create a ctf_fs_ds_file");
- ret = -1;
- goto end;
- }
-
/*
* Turn on dry run mode to prevent the creation and usage of Babeltrace
* library objects (bt_field, bt_message_*, etc.).
ctf_msg_iter_set_dry_run(msg_iter, true);
/* Seek to the beginning of the target packet. */
- iter_status = ctf_msg_iter_seek(ds_file->msg_iter, index_entry->offset);
+ iter_status = ctf_msg_iter_seek(msg_iter, index_entry->offset);
if (iter_status) {
/* ctf_msg_iter_seek() logs errors. */
ret = -1;
* snapshot.
*/
iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(
- ds_file->msg_iter, cs);
+ msg_iter, cs);
break;
case LAST_EVENT:
/* Decode the packet to extract the last event's clock snapshot. */
iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(
- ds_file->msg_iter, cs);
+ msg_iter, cs);
break;
default:
bt_common_abort();
projects / babeltrace.git / blobdiff