ctf: make msg-iter not use bt_packet_context_field

[babeltrace.git] / src / plugins / ctf / fs-src / fs.c

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index 451e411664f126e2e311be8517e5a969d532dc65..ceeb4bc268436141154e59b3bfe8b9502bf51a19 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -265,12 +265,6 @@ bt_component_class_message_iterator_initialize_method_status ctf_fs_iterator_ini
                goto error;
        }
 
-       /* FIXME: This is temporary, those functions will be removed. */
-       ctf_msg_iter_set_emit_stream_end_message(
-               msg_iter_data->msg_iter, true);
-       ctf_msg_iter_set_emit_stream_beginning_message(
-               msg_iter_data->msg_iter, true);
-
        /*
         * This iterator can seek forward if its stream class has a default
         * clock class.
@@ -560,12 +554,7 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group)
                g_ptr_array_free(ds_file_group->ds_file_infos, TRUE);
        }
 
-       if (ds_file_group->index) {
-               if (ds_file_group->index->entries) {
-                       g_ptr_array_free(ds_file_group->index->entries, TRUE);
-               }
-               g_free(ds_file_group->index);
-       }
+       ctf_fs_ds_index_destroy(ds_file_group->index);
 
        bt_stream_put_ref(ds_file_group->stream);
        g_free(ds_file_group);
@@ -775,6 +764,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                goto error;
        }
 
+       ctf_msg_iter_set_dry_run(msg_iter, true);
+
        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,
@@ -819,7 +810,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 
        if (begin_ns == -1) {
                /*
-                * No beggining timestamp to sort the stream files
+                * No beginning timestamp to sort the stream files
                 * within a stream file group, so consider that this
                 * file must be the only one within its group.
                 */