ctf: use create + append/insert functions when possible
[babeltrace.git] / src / plugins / ctf / fs-src / query.c
index b2e5248dc69c0a21607fa1df6aede774a4cb5e05..e817165c4e6c4a12285f6e5a30726ab05896262c 100644 (file)
@@ -37,6 +37,7 @@
 #include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 #include "fs.h"
+#include "logging/comp-logging.h"
 
 #define METADATA_TEXT_SIG      "/* CTF 1.8"
 
@@ -48,12 +49,14 @@ struct range {
 
 BT_HIDDEN
 bt_component_class_query_method_status metadata_info_query(
-               bt_self_component_class_source *comp_class,
+               bt_self_component_class_source *self_comp_class_src,
                const bt_value *params, bt_logging_level log_level,
                const bt_value **user_result)
 {
        bt_component_class_query_method_status status =
                BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+       bt_self_component_class *self_comp_class =
+               bt_self_component_class_source_as_self_component_class(self_comp_class_src);
        bt_value *result = NULL;
        const bt_value *path_value = NULL;
        char *metadata_text = NULL;
@@ -73,20 +76,23 @@ bt_component_class_query_method_status metadata_info_query(
        BT_ASSERT(params);
 
        if (!bt_value_is_map(params)) {
-               BT_LOGE_STR("Query parameters is not a map value object.");
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Query parameters is not a map value object.");
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
 
        path_value = bt_value_map_borrow_entry_value_const(params, "path");
        if (!path_value) {
-               BT_LOGE_STR("Mandatory `path` parameter missing");
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Mandatory `path` parameter missing");
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
 
        if (!bt_value_is_string(path_value)) {
-               BT_LOGE_STR("`path` parameter is required to be a string value");
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "`path` parameter is required to be a string value");
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
@@ -96,7 +102,8 @@ bt_component_class_query_method_status metadata_info_query(
        BT_ASSERT(path);
        metadata_fp = ctf_fs_metadata_open_file(path);
        if (!metadata_fp) {
-               BT_LOGE("Cannot open trace metadata: path=\"%s\".", path);
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Cannot open trace metadata: path=\"%s\".", path);
                goto error;
        }
 
@@ -108,7 +115,8 @@ bt_component_class_query_method_status metadata_info_query(
                        metadata_fp, &metadata_text, bo, NULL, NULL,
                        log_level, NULL);
                if (ret) {
-                       BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
+                       BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                               "Cannot decode packetized metadata file: path=\"%s\"",
                                path);
                        goto error;
                }
@@ -117,25 +125,29 @@ bt_component_class_query_method_status metadata_info_query(
 
                ret = fseek(metadata_fp, 0, SEEK_END);
                if (ret) {
-                       BT_LOGE_ERRNO("Failed to seek to the end of the metadata file",
+                       BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(self_comp_class,
+                               "Failed to seek to the end of the metadata file",
                                ": path=\"%s\"", path);
                        goto error;
                }
                filesize = ftell(metadata_fp);
                if (filesize < 0) {
-                       BT_LOGE_ERRNO("Failed to get the current position in the metadata file",
+                       BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(self_comp_class,
+                               "Failed to get the current position in the metadata file",
                                ": path=\"%s\"", path);
                        goto error;
                }
                rewind(metadata_fp);
                metadata_text = malloc(filesize + 1);
                if (!metadata_text) {
-                       BT_LOGE_STR("Cannot allocate buffer for metadata text.");
+                       BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                               "Cannot allocate buffer for metadata text.");
                        goto error;
                }
 
                if (fread(metadata_text, filesize, 1, metadata_fp) != 1) {
-                       BT_LOGE_ERRNO("Cannot read metadata file", ": path=\"%s\"",
+                       BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(self_comp_class,
+                               "Cannot read metadata file", ": path=\"%s\"",
                                path);
                        goto error;
                }
@@ -159,14 +171,16 @@ bt_component_class_query_method_status metadata_info_query(
        ret = bt_value_map_insert_string_entry(result, "text",
                g_metadata_text->str);
        if (ret) {
-               BT_LOGE_STR("Cannot insert metadata text into query result.");
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Cannot insert metadata text into query result.");
                goto error;
        }
 
        ret = bt_value_map_insert_bool_entry(result, "is-packetized",
                is_packetized);
        if (ret) {
-               BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Cannot insert \"is-packetized\" attribute into query result.");
                goto error;
        }
 
@@ -201,15 +215,16 @@ int add_range(bt_value *info, struct range *range,
 {
        int ret = 0;
        bt_value_map_insert_entry_status status;
-       bt_value *range_map = NULL;
+       bt_value *range_map;
 
        if (!range->set) {
                /* Not an error. */
                goto end;
        }
 
-       range_map = bt_value_map_create();
-       if (!range_map) {
+       status = bt_value_map_insert_empty_map_entry(info, range_name,
+               &range_map);
+       if (status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
                ret = -1;
                goto end;
        }
@@ -228,40 +243,6 @@ int add_range(bt_value *info, struct range *range,
                goto end;
        }
 
-       status = bt_value_map_insert_entry(info, range_name,
-               range_map);
-       if (status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
-               ret = -1;
-               goto end;
-       }
-
-end:
-       bt_value_put_ref(range_map);
-       return ret;
-}
-
-static
-int add_stream_ids(bt_value *info, struct ctf_fs_ds_file_group *ds_file_group)
-{
-       int ret = 0;
-       bt_value_map_insert_entry_status status;
-
-       if (ds_file_group->stream_id != UINT64_C(-1)) {
-               status = bt_value_map_insert_unsigned_integer_entry(info, "id",
-                       ds_file_group->stream_id);
-               if (status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
-       status = bt_value_map_insert_unsigned_integer_entry(info, "class-id",
-               ds_file_group->sc->id);
-       if (status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
-               ret = -1;
-               goto end;
-       }
-
 end:
        return ret;
 }
@@ -271,32 +252,10 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                bt_value *group_info, struct range *stream_range)
 {
        int ret = 0;
-       size_t file_idx;
        bt_value_map_insert_entry_status insert_status;
-       bt_value_array_append_element_status append_status;
-       bt_value *file_paths;
        struct ctf_fs_ds_index_entry *first_ds_index_entry, *last_ds_index_entry;
        gchar *port_name = NULL;
 
-       file_paths = bt_value_array_create();
-       if (!file_paths) {
-               ret = -1;
-               goto end;
-       }
-
-       for (file_idx = 0; file_idx < group->ds_file_infos->len; file_idx++) {
-               struct ctf_fs_ds_file_info *info =
-                       g_ptr_array_index(group->ds_file_infos,
-                               file_idx);
-
-               append_status = bt_value_array_append_string_element(file_paths,
-                               info->path->str);
-               if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
        /*
         * Since each `struct ctf_fs_ds_file_group` has a sorted array of
         * `struct ctf_fs_ds_index_entry`, we can compute the stream range from
@@ -331,18 +290,6 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                goto end;
        }
 
-       insert_status = bt_value_map_insert_entry(group_info, "paths",
-               file_paths);
-       if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
-               ret = -1;
-               goto end;
-       }
-
-       ret = add_stream_ids(group_info, group);
-       if (ret) {
-               goto end;
-       }
-
        port_name = ctf_fs_make_port_name(group);
        if (!port_name) {
                ret = -1;
@@ -358,7 +305,6 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
 
 end:
        g_free(port_name);
-       bt_value_put_ref(file_paths);
        return ret;
 }
 
@@ -370,11 +316,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_range = {
-               .begin_ns = INT64_MAX,
-               .end_ns = 0,
-               .set = false,
-       };
        struct range trace_intersection = {
                .begin_ns = 0,
                .end_ns = INT64_MAX,
@@ -388,19 +329,8 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                goto end;
        }
 
-       file_groups = bt_value_array_create();
-       if (!file_groups) {
-               goto end;
-       }
-
-       insert_status = bt_value_map_insert_string_entry(trace_info, "name",
-               trace->name->str);
-       if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
-               ret = -1;
-               goto end;
-       }
-       insert_status = bt_value_map_insert_string_entry(trace_info, "path",
-               trace->path->str);
+       insert_status = bt_value_map_insert_empty_array_entry(trace_info,
+               "streams", &file_groups);
        if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
                ret = -1;
                goto end;
@@ -414,32 +344,19 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                struct ctf_fs_ds_file_group *group = g_ptr_array_index(
                                trace->ds_file_groups, group_idx);
 
-               group_info = bt_value_map_create();
-               if (!group_info) {
+               append_status = bt_value_array_append_empty_map_element(
+                       file_groups, &group_info);
+               if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
                        ret = -1;
                        goto end;
                }
 
                ret = populate_stream_info(group, group_info, &group_range);
                if (ret) {
-                       bt_value_put_ref(group_info);
-                       goto end;
-               }
-
-               append_status = bt_value_array_append_element(file_groups,
-                       group_info);
-               bt_value_put_ref(group_info);
-               if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
                        goto end;
                }
 
                if (group_range.set) {
-                       trace_range.begin_ns = MIN(trace_range.begin_ns,
-                                       group_range.begin_ns);
-                       trace_range.end_ns = MAX(trace_range.end_ns,
-                                       group_range.end_ns);
-                       trace_range.set = true;
-
                        trace_intersection.begin_ns = MAX(trace_intersection.begin_ns,
                                        group_range.begin_ns);
                        trace_intersection.end_ns = MIN(trace_intersection.end_ns,
@@ -448,11 +365,6 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                }
        }
 
-       ret = add_range(trace_info, &trace_range, "range-ns");
-       if (ret) {
-               goto end;
-       }
-
        if (trace_intersection.begin_ns < trace_intersection.end_ns) {
                ret = add_range(trace_info, &trace_intersection,
                                "intersection-range-ns");
@@ -461,28 +373,22 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                }
        }
 
-       insert_status = bt_value_map_insert_entry(trace_info, "streams",
-               file_groups);
-       BT_VALUE_PUT_REF_AND_RESET(file_groups);
-       if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
-               ret = -1;
-               goto end;
-       }
-
 end:
-       bt_value_put_ref(file_groups);
        return ret;
 }
 
 BT_HIDDEN
 bt_component_class_query_method_status trace_info_query(
-               bt_self_component_class_source *comp_class,
+               bt_self_component_class_source *self_comp_class_src,
                const bt_value *params, bt_logging_level log_level,
                const bt_value **user_result)
 {
        struct ctf_fs_component *ctf_fs = NULL;
        bt_component_class_query_method_status status =
                BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+       bt_self_component_class *self_comp_class =
+               bt_self_component_class_source_as_self_component_class(
+                       self_comp_class_src);
        bt_value *result = NULL;
        const bt_value *inputs_value = NULL;
        int ret = 0;
@@ -491,7 +397,8 @@ bt_component_class_query_method_status trace_info_query(
        BT_ASSERT(params);
 
        if (!bt_value_is_map(params)) {
-               BT_LOGE("Query parameters is not a map value object.");
+               BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                       "Query parameters is not a map value object.");
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
@@ -501,12 +408,14 @@ bt_component_class_query_method_status trace_info_query(
                goto error;
        }
 
-       if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) {
+       if (!read_src_fs_parameters(params, &inputs_value, ctf_fs, NULL,
+                       self_comp_class)) {
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
 
-       if (ctf_fs_component_create_ctf_fs_traces(NULL, ctf_fs, inputs_value)) {
+       if (ctf_fs_component_create_ctf_fs_traces(ctf_fs, inputs_value, NULL,
+                       self_comp_class)) {
                goto error;
        }
 
@@ -524,22 +433,16 @@ bt_component_class_query_method_status trace_info_query(
                trace = g_ptr_array_index(ctf_fs->traces, i);
                BT_ASSERT(trace);
 
-               trace_info = bt_value_map_create();
-               if (!trace_info) {
-                       BT_LOGE("Failed to create trace info map.");
+               append_status = bt_value_array_append_empty_map_element(result,
+                       &trace_info);
+               if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
+                       BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+                               "Failed to create trace info map.");
                        goto error;
                }
 
                ret = populate_trace_info(trace, trace_info);
                if (ret) {
-                       bt_value_put_ref(trace_info);
-                       goto error;
-               }
-
-               append_status = bt_value_array_append_element(result,
-                       trace_info);
-               bt_value_put_ref(trace_info);
-               if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
                        goto error;
                }
        }
This page took 0.027783 seconds and 4 git commands to generate.