src.ctf.fs: deterministically sort trace's DS file groups

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

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 43041de30320dc7f63a4be39e11d37e575f19968..048bc48acd54bd8c2538bc24c5e490cbec4108fa 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -285,11 +285,6 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
        bt_value_map_insert_entry_status insert_status;
        bt_value_array_append_element_status append_status;
        bt_value *file_groups = NULL;
-       struct range trace_intersection = {
-               .begin_ns = 0,
-               .end_ns = INT64_MAX,
-               .set = false,
-       };
 
        BT_ASSERT(trace->ds_file_groups);
        /* Add trace range info only if it contains streams. */
@@ -299,7 +294,7 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
        }
 
        insert_status = bt_value_map_insert_empty_array_entry(trace_info,
-               "streams", &file_groups);
+               "stream-infos", &file_groups);
        if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
                ret = -1;
                goto end;
@@ -324,22 +319,6 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                if (ret) {
                        goto end;
                }
-
-               if (group_range.set) {
-                       trace_intersection.begin_ns = MAX(trace_intersection.begin_ns,
-                                       group_range.begin_ns);
-                       trace_intersection.end_ns = MIN(trace_intersection.end_ns,
-                                       group_range.end_ns);
-                       trace_intersection.set = true;
-               }
-       }
-
-       if (trace_intersection.begin_ns < trace_intersection.end_ns) {
-               ret = add_range(trace_info, &trace_intersection,
-                               "intersection-range-ns");
-               if (ret) {
-                       goto end;
-               }
        }
 
 end:
@@ -347,7 +326,7 @@ end:
 }
 
 BT_HIDDEN
-bt_component_class_query_method_status trace_info_query(
+bt_component_class_query_method_status trace_infos_query(
                bt_self_component_class_source *self_comp_class_src,
                const bt_value *params, bt_logging_level log_level,
                const bt_value **user_result)
@@ -360,6 +339,7 @@ bt_component_class_query_method_status trace_info_query(
                        self_comp_class_src);
        bt_value *result = NULL;
        const bt_value *inputs_value = NULL;
+       const bt_value *trace_name_value;
        int ret = 0;
        bt_value *trace_info = NULL;
        bt_value_array_append_element_status append_status;
@@ -378,14 +358,14 @@ bt_component_class_query_method_status trace_info_query(
                goto error;
        }
 
-       if (!read_src_fs_parameters(params, &inputs_value, ctf_fs, NULL,
-                       self_comp_class)) {
+       if (!read_src_fs_parameters(params, &inputs_value, &trace_name_value,
+                       ctf_fs, NULL, self_comp_class)) {
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
 
-       if (ctf_fs_component_create_ctf_fs_trace(ctf_fs, inputs_value, NULL,
-                       self_comp_class)) {
+       if (ctf_fs_component_create_ctf_fs_trace(ctf_fs, inputs_value,
+                       trace_name_value, NULL, self_comp_class)) {
                goto error;
        }
 
@@ -412,7 +392,6 @@ bt_component_class_query_method_status trace_info_query(
 
 error:
        BT_VALUE_PUT_REF_AND_RESET(result);
-       result = NULL;
 
        if (status >= 0) {
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;