Rename pc_msg_iter fields to self_msg_iter

[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 ee322c0e50851d1b4e107f977776fe974c05f38b..f03a363535b18933ae2d343a812b47d1e74c55b3 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -69,7 +69,7 @@ int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data
        ctf_fs_ds_file_destroy(msg_iter_data->ds_file);
        msg_iter_data->ds_file = ctf_fs_ds_file_create(
                msg_iter_data->ds_file_group->ctf_fs_trace,
-               msg_iter_data->pc_msg_iter,
+               msg_iter_data->self_msg_iter,
                msg_iter_data->msg_iter,
                msg_iter_data->ds_file_group->stream,
                ds_file_info->path->str,
@@ -118,7 +118,7 @@ bt_component_class_message_iterator_next_method_status ctf_fs_iterator_next_one(
 {
        bt_component_class_message_iterator_next_method_status status;
 
-       BT_ASSERT(msg_iter_data->ds_file);
+       BT_ASSERT_DBG(msg_iter_data->ds_file);
 
        while (true) {
                bt_message *msg;
@@ -276,7 +276,7 @@ bt_component_class_message_iterator_initialize_method_status ctf_fs_iterator_ini
 
        msg_iter_data->log_level = log_level;
        msg_iter_data->self_comp = self_comp;
-       msg_iter_data->pc_msg_iter = self_msg_iter;
+       msg_iter_data->self_msg_iter = self_msg_iter;
        msg_iter_data->msg_iter = bt_msg_iter_create(
                port_data->ds_file_group->ctf_fs_trace->metadata->tc,
                bt_common_get_page_size(msg_iter_data->log_level) * 8,
@@ -785,8 +785,11 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 
        index = ctf_fs_ds_file_build_index(ds_file, ds_file_info);
        if (!index) {
-               BT_COMP_LOGW("Failed to index CTF stream file \'%s\'",
+               BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
+                       self_comp, self_comp_class,
+                       "Failed to index CTF stream file \'%s\'",
                        ds_file->file->path->str);
+               goto error;
        }
 
        if (begin_ns == -1) {
@@ -815,7 +818,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                        goto error;
                }
 
-               ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
+               ds_file_group_insert_ds_file_info_sorted(ds_file_group,
+                       BT_MOVE_REF(ds_file_info));
 
                add_group = true;
                goto end;
@@ -852,7 +856,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                merge_ctf_fs_ds_indexes(ds_file_group->index, index);
        }
 
-       ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
+       ds_file_group_insert_ds_file_info_sorted(ds_file_group,
+               BT_MOVE_REF(ds_file_info));
 
        goto end;
 
@@ -867,6 +872,7 @@ end:
        }
 
        ctf_fs_ds_file_destroy(ds_file);
+       ctf_fs_ds_file_info_destroy(ds_file_info);
 
        if (msg_iter) {
                bt_msg_iter_destroy(msg_iter);
@@ -1484,7 +1490,7 @@ int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
                        ds_file->msg_iter, cs);
                break;
        default:
-               abort();
+               bt_common_abort();
        }
        if (iter_status) {
                ret = -1;