src.ctf.fs: make ds_file_group_insert_ds_file_info_sorted a method of ctf_fs_ds_file_...

Change-Id: I743359a80d39e307f4aa36b2deaa92429c536cea
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8404
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12347
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp
index 330e47f55b9932f5dd6793c15757d6d66cf3b235..73c896a99fed0eca8453362d95681de9492c9186 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.cpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.cpp
@@ -745,3 +745,19 @@ ctf_fs_ds_file_group::UP ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs
 
     return ds_file_group;
 }
+
+void ctf_fs_ds_file_group::insert_ds_file_info_sorted(ctf_fs_ds_file_info::UP ds_file_info)
+{
+    /* Find the spot where to insert this ds_file_info. */
+    auto it = this->ds_file_infos.begin();
+
+    for (; it != this->ds_file_infos.end(); ++it) {
+        const ctf_fs_ds_file_info& other_ds_file_info = **it;
+
+        if (ds_file_info->begin_ns < other_ds_file_info.begin_ns) {
+            break;
+        }
+    }
+
+    this->ds_file_infos.insert(it, std::move(ds_file_info));
+}

diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp
index 6abca11b438693dedadb6522ffc7b54250ca6222..f27dbde701206202f33ebb06c0da08d80101bbaa 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -121,6 +121,12 @@ struct ctf_fs_ds_file_group
 {
     using UP = std::unique_ptr<ctf_fs_ds_file_group>;
 
+    /*
+     * Insert ds_file_info in the list of ds_file_infos at the right
+     * place to keep it sorted.
+     */
+    void insert_ds_file_info_sorted(ctf_fs_ds_file_info::UP ds_file_info);
+
     /*
      * This is an _ordered_ array of data stream file infos which
      * belong to this group (a single stream instance).

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 6a96394281c78e9f90ac593e917239f2e25694b6..6123487d971d18808ef4da935db7e6d0a395f47e 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -330,28 +330,6 @@ static int create_ports_for_trace(struct ctf_fs_component *ctf_fs,
     return 0;
 }
 
-/*
- * Insert ds_file_info in ds_file_group's list of ds_file_infos at the right
- * place to keep it sorted.
- */
-
-static void ds_file_group_insert_ds_file_info_sorted(struct ctf_fs_ds_file_group *ds_file_group,
-                                                     ctf_fs_ds_file_info::UP ds_file_info)
-{
-    /* Find the spot where to insert this ds_file_info. */
-    auto it = ds_file_group->ds_file_infos.begin();
-
-    for (; it != ds_file_group->ds_file_infos.end(); ++it) {
-        const ctf_fs_ds_file_info& other_ds_file_info = **it;
-
-        if (ds_file_info->begin_ns < other_ds_file_info.begin_ns) {
-            break;
-        }
-    }
-
-    ds_file_group->ds_file_infos.insert(it, std::move(ds_file_info));
-}
-
 static bool ds_index_entries_equal(const ctf_fs_ds_index_entry& left,
                                    const ctf_fs_ds_index_entry& right)
 {
@@ -499,7 +477,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const
             return -1;
         }
 
-        ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(), std::move(ds_file_info));
+        new_ds_file_group->insert_ds_file_info_sorted(std::move(ds_file_info));
         ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
         return 0;
     }
@@ -531,7 +509,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const
         merge_ctf_fs_ds_indexes(&ds_file_group->index, *index);
     }
 
-    ds_file_group_insert_ds_file_info_sorted(ds_file_group, std::move(ds_file_info));
+    ds_file_group->insert_ds_file_info_sorted(std::move(ds_file_info));
 
     return 0;
 }
@@ -753,7 +731,7 @@ static void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest,
                                         ctf_fs_ds_file_group::UP src)
 {
     for (auto& ds_file_info : src->ds_file_infos) {
-        ds_file_group_insert_ds_file_info_sorted(dest, std::move(ds_file_info));
+        dest->insert_ds_file_info_sorted(std::move(ds_file_info));
     }
 
     /* Merge both indexes. */