Cleanup: src.ctf.fs: index no longer used in loop
authorFrancis Deslauriers <francis.deslauriers@efficios.com>
Fri, 10 May 2019 18:34:00 +0000 (14:34 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 14 May 2019 19:13:53 +0000 (15:13 -0400)
This removal should have been done in an earlier commit modifying this
loop:
  Author: Francis Deslauriers <francis.deslauriers@efficios.com>
  Date:   Tue Apr 30 19:01:17 2019 -0400

      src.ctf.fs: compute stream range using entire file info group

      Given that index entries are sorted within their file info structure and
      that file info structures are sorted by time within the file info group,
      we can simply compute the range of the stream by using the absolute
      first index entry and the absolute last index entry of the entire file
      info group.

Add `BT_ASSERT()` to enforce invariants in developer mode.

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I4e0b53cbb808835886b97b6d6001ecd7bcc2abb4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1288
Reviewed-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
plugins/ctf/fs-src/query.c

index e7746f4573de2c0c1028ff41866b6079484bfaa8..31d710814b92812578d2ab7582fb85e89609e502 100644 (file)
@@ -285,13 +285,6 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                        g_ptr_array_index(group->ds_file_infos,
                                file_idx);
 
-               if (!info->index || info->index->entries->len == 0) {
-                       BT_LOGW("Cannot determine range of unindexed stream file \'%s\'",
-                               info->path->str);
-                       ret = -1;
-                       goto end;
-               }
-
                status = bt_value_array_append_string_element(file_paths,
                                info->path->str);
                if (status != BT_VALUE_STATUS_OK) {
@@ -314,11 +307,15 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
        last_file_info = g_ptr_array_index(group->ds_file_infos,
                group->ds_file_infos->len - 1);
 
+       BT_ASSERT(first_file_info->index);
+       BT_ASSERT(first_file_info->index->entries);
        BT_ASSERT(first_file_info->index->entries->len > 0);
 
        first_ds_index_entry = (struct ctf_fs_ds_index_entry *) &g_array_index(
                first_file_info->index->entries, struct ctf_fs_ds_index_entry, 0);
 
+       BT_ASSERT(last_file_info->index);
+       BT_ASSERT(last_file_info->index->entries);
        BT_ASSERT(last_file_info->index->entries->len > 0);
 
        last_ds_index_entry = (struct ctf_fs_ds_index_entry *) &g_array_index(
This page took 0.025182 seconds and 4 git commands to generate.