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 048bc48acd54bd8c2538bc24c5e490cbec4108fa..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,6 +296,8 @@ 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;
        }
 
@@ -383,7 +391,8 @@ bt_component_class_query_method_status trace_infos_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;
        }
@@ -447,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;