ctf: append error causes when returning errors

[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..adc8f4d12fc9280f81d439c69bcb3f3134d2241d 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -1,27 +1,9 @@
 /*
- * query.c
- *
- * Babeltrace CTF file system Reader Component queries
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Babeltrace CTF file system Reader Component queries
  */
 
 #define BT_LOG_OUTPUT_LEVEL log_level
@@ -123,6 +105,7 @@ bt_component_class_query_method_status metadata_info_query(
        }
 
        decoder_cfg.log_level = log_level;
+       decoder_cfg.self_comp_class = self_comp_class;
        decoder_cfg.keep_plain_text = true;
        decoder = ctf_metadata_decoder_create(&decoder_cfg);
        if (!decoder) {
@@ -171,7 +154,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 +265,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 +279,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 +374,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,13 +439,15 @@ 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;
                bt_uuid_t uuid;
 
                metadata_decoder_config.log_level = log_level;
+               metadata_decoder_config.self_comp_class =
+                       bt_self_component_class_source_as_self_component_class(comp_class);
 
                metadata_decoder = ctf_metadata_decoder_create(
                        &metadata_decoder_config);