ctf: remove ctf_fs_ds_file::msg_iter field

[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 cc58872c8092d480c9cb64de4293c4342bed2034..cabb3683d8c97403ff5da73e05f367bba198fb2a 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -171,7 +171,11 @@ end:
        ctf_metadata_decoder_destroy(decoder);
 
        if (metadata_fp) {
-               fclose(metadata_fp);
+               ret = fclose(metadata_fp);
+               if (ret) {
+                       BT_LOGE_ERRNO("Cannot close metatada file stream",
+                               ": path=\"%s\"", path);
+               }
        }
 
        *user_result = result;
@@ -278,7 +282,9 @@ end:
 }
 
 static
-int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
+int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info,
+               bt_logging_level log_level,
+               bt_self_component_class *self_comp_class)
 {
        int ret = 0;
        size_t group_idx;
@@ -290,11 +296,13 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
        /* Add trace range info only if it contains streams. */
        if (trace->ds_file_groups->len == 0) {
                ret = -1;
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Trace has no streams: trace-path=%s", trace->path->str);
                goto end;
        }
 
        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;
@@ -326,7 +334,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)
@@ -339,6 +347,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;
@@ -357,14 +366,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;
        }
 
@@ -382,7 +391,8 @@ bt_component_class_query_method_status trace_info_query(
                goto error;
        }
 
-       ret = populate_trace_info(ctf_fs->trace, trace_info);
+       ret = populate_trace_info(ctf_fs->trace, trace_info, log_level,
+               self_comp_class);
        if (ret) {
                goto error;
        }
@@ -446,7 +456,7 @@ bt_component_class_query_method_status support_info_query(
                goto end;
        }
 
-       metadata_file = g_fopen(metadata_path, "r");
+       metadata_file = g_fopen(metadata_path, "rb");
        if (metadata_file) {
                struct ctf_metadata_decoder_config metadata_decoder_config = { 0 };
                enum ctf_metadata_decoder_status decoder_status;