lib: make trace IR API const-correct

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

diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c
index 96bf91ca0eaa11c7a6a67934d66527c1377ad0e9..6f2017b20688147e52806b96727bc9d011a4026a 100644 (file)
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -46,16 +46,14 @@ struct range {
 };
 
 BT_HIDDEN
-struct bt_component_class_query_method_return metadata_info_query(
-               struct bt_component_class *comp_class,
-               struct bt_value *params)
+enum bt_query_status metadata_info_query(
+               struct bt_self_component_class_source *comp_class,
+               const struct bt_value *params,
+               const struct bt_value **user_result)
 {
-       struct bt_component_class_query_method_return query_ret = {
-               .result = NULL,
-               .status = BT_QUERY_STATUS_OK,
-       };
-
-       struct bt_value *path_value = NULL;
+       enum bt_query_status status = BT_QUERY_STATUS_OK;
+       struct bt_value *result = NULL;
+       const struct bt_value *path_value = NULL;
        char *metadata_text = NULL;
        FILE *metadata_fp = NULL;
        GString *g_metadata_text = NULL;
@@ -64,9 +62,9 @@ struct bt_component_class_query_method_return metadata_info_query(
        const char *path;
        bool is_packetized;
 
-       query_ret.result = bt_value_map_create();
-       if (!query_ret.result) {
-               query_ret.status = BT_QUERY_STATUS_NOMEM;
+       result = bt_value_map_create();
+       if (!result) {
+               status = BT_QUERY_STATUS_NOMEM;
                goto error;
        }
 
@@ -74,17 +72,12 @@ struct bt_component_class_query_method_return metadata_info_query(
 
        if (!bt_value_is_map(params)) {
                BT_LOGE_STR("Query parameters is not a map value object.");
-               query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
+               status = BT_QUERY_STATUS_INVALID_PARAMS;
                goto error;
        }
 
-       path_value = bt_value_map_borrow(params, "path");
-       ret = bt_value_string_get(path_value, &path);
-       if (ret) {
-               BT_LOGE_STR("Cannot get `path` string parameter.");
-               query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
-               goto error;
-       }
+       path_value = bt_value_map_borrow_entry_value_const(params, "path");
+       path = bt_value_string_get(path_value);
 
        BT_ASSERT(path);
        metadata_fp = ctf_fs_metadata_open_file(path);
@@ -148,14 +141,14 @@ struct bt_component_class_query_method_return metadata_info_query(
 
        g_string_append(g_metadata_text, metadata_text);
 
-       ret = bt_value_map_insert_string(query_ret.result, "text",
+       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.");
                goto error;
        }
 
-       ret = bt_value_map_insert_bool(query_ret.result, "is-packetized",
+       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.");
@@ -165,10 +158,11 @@ struct bt_component_class_query_method_return metadata_info_query(
        goto end;
 
 error:
-       BT_PUT(query_ret.result);
+       BT_OBJECT_PUT_REF_AND_RESET(result);
+       result = NULL;
 
-       if (query_ret.status >= 0) {
-               query_ret.status = BT_QUERY_STATUS_ERROR;
+       if (status >= 0) {
+               status = BT_QUERY_STATUS_ERROR;
        }
 
 end:
@@ -182,7 +176,8 @@ end:
                fclose(metadata_fp);
        }
 
-       return query_ret;
+       *user_result = result;
+       return status;
 }
 
 static
@@ -204,41 +199,43 @@ int add_range(struct bt_value *info, struct range *range,
                goto end;
        }
 
-       status = bt_value_map_insert_integer(range_map, "begin",
+       status = bt_value_map_insert_integer_entry(range_map, "begin",
                        range->begin_ns);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
 
-       status = bt_value_map_insert_integer(range_map, "end",
+       status = bt_value_map_insert_integer_entry(range_map, "end",
                        range->end_ns);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
 
-       status = bt_value_map_insert(info, range_name, range_map);
+       status = bt_value_map_insert_entry(info, range_name,
+               range_map);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
+
 end:
-       bt_put(range_map);
+       bt_object_put_ref(range_map);
        return ret;
 }
 
 static
-int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
+int add_stream_ids(struct bt_value *info, const struct bt_stream *stream)
 {
        int ret = 0;
        int64_t stream_class_id, stream_instance_id;
        enum bt_value_status status;
-       struct bt_stream_class *stream_class = NULL;
+       const struct bt_stream_class *stream_class = NULL;
 
        stream_instance_id = bt_stream_get_id(stream);
        if (stream_instance_id != -1) {
-               status = bt_value_map_insert_integer(info, "id",
+               status = bt_value_map_insert_integer_entry(info, "id",
                                stream_instance_id);
                if (status != BT_VALUE_STATUS_OK) {
                        ret = -1;
@@ -246,7 +243,7 @@ int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
                }
        }
 
-       stream_class = bt_stream_borrow_class(stream);
+       stream_class = bt_stream_borrow_class_const(stream);
        if (!stream_class) {
                ret = -1;
                goto end;
@@ -258,7 +255,7 @@ int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
                goto end;
        }
 
-       status = bt_value_map_insert_integer(info, "class-id", stream_class_id);
+       status = bt_value_map_insert_integer_entry(info, "class-id", stream_class_id);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
@@ -270,8 +267,7 @@ end:
 
 static
 int populate_stream_info(struct ctf_fs_ds_file_group *group,
-               struct bt_value *group_info,
-               struct range *stream_range)
+               struct bt_value *group_info, struct range *stream_range)
 {
        int ret = 0;
        size_t file_idx;
@@ -300,7 +296,7 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                        goto end;
                }
 
-               status = bt_value_array_append_string(file_paths,
+               status = bt_value_array_append_string_element(file_paths,
                                info->path->str);
                if (status != BT_VALUE_STATUS_OK) {
                        ret = -1;
@@ -328,7 +324,8 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                }
        }
 
-       status = bt_value_map_insert(group_info, "paths", file_paths);
+       status = bt_value_map_insert_entry(group_info, "paths",
+               file_paths);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
@@ -339,7 +336,7 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                goto end;
        }
 end:
-       bt_put(file_paths);
+       bt_object_put_ref(file_paths);
        return ret;
 }
 
@@ -368,20 +365,20 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
                goto end;
        }
 
-       status = bt_value_map_insert_string(trace_info, "name",
-                       trace_name);
+       status = bt_value_map_insert_string_entry(trace_info, "name",
+               trace_name);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
-       status = bt_value_map_insert_string(trace_info, "path",
+       status = bt_value_map_insert_string_entry(trace_info, "path",
                        trace_path);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
 
-       trace = ctf_fs_trace_create(trace_path, trace_name, NULL, NULL);
+       trace = ctf_fs_trace_create(trace_path, trace_name, NULL);
        if (!trace) {
                BT_LOGE("Failed to create fs trace at \'%s\'", trace_path);
                ret = -1;
@@ -411,7 +408,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 
                ret = populate_stream_info(group, group_info, &group_range);
                if (ret) {
-                       bt_put(group_info);
+                       bt_object_put_ref(group_info);
                        goto end;
                }
 
@@ -427,8 +424,10 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
                        trace_intersection.end_ns = min(trace_intersection.end_ns,
                                        group_range.end_ns);
                        trace_intersection.set = true;
-                       status = bt_value_array_append(file_groups, group_info);
-                       bt_put(group_info);
+                       status = bt_value_array_append_element(
+                               file_groups,
+                               group_info);
+                       bt_object_put_ref(group_info);
                        if (status != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
@@ -448,30 +447,29 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
                }
        }
 
-       status = bt_value_map_insert(trace_info, "streams", file_groups);
-       BT_PUT(file_groups);
+       status = bt_value_map_insert_entry(trace_info, "streams",
+               file_groups);
+       BT_OBJECT_PUT_REF_AND_RESET(file_groups);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
 
 end:
-       bt_put(file_groups);
+       bt_object_put_ref(file_groups);
        ctf_fs_trace_destroy(trace);
        return ret;
 }
 
 BT_HIDDEN
-struct bt_component_class_query_method_return trace_info_query(
-               struct bt_component_class *comp_class,
-               struct bt_value *params)
+enum bt_query_status trace_info_query(
+               struct bt_self_component_class_source *comp_class,
+               const struct bt_value *params,
+               const struct bt_value **user_result)
 {
-       struct bt_component_class_query_method_return query_ret = {
-               .result = NULL,
-               .status = BT_QUERY_STATUS_OK,
-       };
-
-       struct bt_value *path_value = NULL;
+       enum bt_query_status status = BT_QUERY_STATUS_OK;
+       struct bt_value *result = NULL;
+       const struct bt_value *path_value = NULL;
        int ret = 0;
        const char *path = NULL;
        GList *trace_paths = NULL;
@@ -484,17 +482,12 @@ struct bt_component_class_query_method_return trace_info_query(
 
        if (!bt_value_is_map(params)) {
                BT_LOGE("Query parameters is not a map value object.");
-               query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
+               status = BT_QUERY_STATUS_INVALID_PARAMS;
                goto error;
        }
 
-       path_value = bt_value_map_borrow(params, "path");
-       ret = bt_value_string_get(path_value, &path);
-       if (ret) {
-               BT_LOGE("Cannot get `path` string parameter.");
-               query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
-               goto error;
-       }
+       path_value = bt_value_map_borrow_entry_value_const(params, "path");
+       path = bt_value_string_get(path_value);
 
        normalized_path = bt_common_normalize_path(path, NULL);
        if (!normalized_path) {
@@ -515,9 +508,9 @@ struct bt_component_class_query_method_return trace_info_query(
                goto error;
        }
 
-       query_ret.result = bt_value_array_create();
-       if (!query_ret.result) {
-               query_ret.status = BT_QUERY_STATUS_NOMEM;
+       result = bt_value_array_create();
+       if (!result) {
+               status = BT_QUERY_STATUS_NOMEM;
                goto error;
        }
 
@@ -539,12 +532,12 @@ struct bt_component_class_query_method_return trace_info_query(
                ret = populate_trace_info(trace_path->str, trace_name->str,
                        trace_info);
                if (ret) {
-                       bt_put(trace_info);
+                       bt_object_put_ref(trace_info);
                        goto error;
                }
 
-               status = bt_value_array_append(query_ret.result, trace_info);
-               bt_put(trace_info);
+               status = bt_value_array_append_element(result, trace_info);
+               bt_object_put_ref(trace_info);
                if (status != BT_VALUE_STATUS_OK) {
                        goto error;
                }
@@ -553,10 +546,11 @@ struct bt_component_class_query_method_return trace_info_query(
        goto end;
 
 error:
-       BT_PUT(query_ret.result);
+       BT_OBJECT_PUT_REF_AND_RESET(result);
+       result = NULL;
 
-       if (query_ret.status >= 0) {
-               query_ret.status = BT_QUERY_STATUS_ERROR;
+       if (status >= 0) {
+               status = BT_QUERY_STATUS_ERROR;
        }
 
 end:
@@ -579,6 +573,7 @@ end:
                }
                g_list_free(trace_names);
        }
-       /* "path" becomes invalid with the release of path_value. */
-       return query_ret;
+
+       *user_result = result;
+       return status;
 }