Plugin development API: use self enumeration and plugin types

[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 dd14336667784c9a77bd668402be0c7e5b296159..0cdf22c1e87e28fde9e20155f679e97dd4016b95 100644 (file)
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -47,13 +47,13 @@ struct range {
 
 BT_HIDDEN
 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)
+               bt_self_component_class_source *comp_class,
+               const bt_value *params,
+               const bt_value **user_result)
 {
        enum bt_query_status status = BT_QUERY_STATUS_OK;
-       struct bt_value *result = NULL;
-       const struct bt_value *path_value = NULL;
+       bt_value *result = NULL;
+       const bt_value *path_value = NULL;
        char *metadata_text = NULL;
        FILE *metadata_fp = NULL;
        GString *g_metadata_text = NULL;
@@ -158,7 +158,7 @@ enum bt_query_status metadata_info_query(
        goto end;
 
 error:
-       BT_OBJECT_PUT_REF_AND_RESET(result);
+       BT_VALUE_PUT_REF_AND_RESET(result);
        result = NULL;
 
        if (status >= 0) {
@@ -181,12 +181,12 @@ end:
 }
 
 static
-int add_range(struct bt_value *info, struct range *range,
+int add_range(bt_value *info, struct range *range,
                const char *range_name)
 {
        int ret = 0;
        enum bt_value_status status;
-       struct bt_value *range_map = NULL;
+       bt_value *range_map = NULL;
 
        if (!range->set) {
                /* Not an error. */
@@ -221,17 +221,17 @@ int add_range(struct bt_value *info, struct range *range,
        }
 
 end:
-       bt_object_put_ref(range_map);
+       bt_value_put_ref(range_map);
        return ret;
 }
 
 static
-int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
+int add_stream_ids(bt_value *info, const 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 bt_stream_class *stream_class = NULL;
 
        stream_instance_id = bt_stream_get_id(stream);
        if (stream_instance_id != -1) {
@@ -243,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;
@@ -267,12 +267,12 @@ end:
 
 static
 int populate_stream_info(struct ctf_fs_ds_file_group *group,
-               struct bt_value *group_info, struct range *stream_range)
+               bt_value *group_info, struct range *stream_range)
 {
        int ret = 0;
        size_t file_idx;
        enum bt_value_status status;
-       struct bt_value *file_paths;
+       bt_value *file_paths;
 
        stream_range->begin_ns = INT64_MAX;
        stream_range->end_ns = 0;
@@ -331,25 +331,24 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
                goto end;
        }
 
-       ret = add_stream_ids(group_info,
-               bt_private_stream_as_stream(group->stream));
+       ret = add_stream_ids(group_info, group->stream);
        if (ret) {
                goto end;
        }
 end:
-       bt_object_put_ref(file_paths);
+       bt_value_put_ref(file_paths);
        return ret;
 }
 
 static
 int populate_trace_info(const char *trace_path, const char *trace_name,
-               struct bt_value *trace_info)
+               bt_value *trace_info)
 {
        int ret = 0;
        size_t group_idx;
        struct ctf_fs_trace *trace = NULL;
        enum bt_value_status status;
-       struct bt_value *file_groups;
+       bt_value *file_groups;
        struct range trace_range = {
                .begin_ns = INT64_MAX,
                .end_ns = 0,
@@ -396,7 +395,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
        /* Find range of all stream groups, and of the trace. */
        for (group_idx = 0; group_idx < trace->ds_file_groups->len;
                        group_idx++) {
-               struct bt_value *group_info;
+               bt_value *group_info;
                struct range group_range = { .set = false };
                struct ctf_fs_ds_file_group *group = g_ptr_array_index(
                                trace->ds_file_groups, group_idx);
@@ -409,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_object_put_ref(group_info);
+                       bt_value_put_ref(group_info);
                        goto end;
                }
 
@@ -428,7 +427,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
                        status = bt_value_array_append_element(
                                file_groups,
                                group_info);
-                       bt_object_put_ref(group_info);
+                       bt_value_put_ref(group_info);
                        if (status != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
@@ -450,27 +449,27 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 
        status = bt_value_map_insert_entry(trace_info, "streams",
                file_groups);
-       BT_OBJECT_PUT_REF_AND_RESET(file_groups);
+       BT_VALUE_PUT_REF_AND_RESET(file_groups);
        if (status != BT_VALUE_STATUS_OK) {
                ret = -1;
                goto end;
        }
 
 end:
-       bt_object_put_ref(file_groups);
+       bt_value_put_ref(file_groups);
        ctf_fs_trace_destroy(trace);
        return ret;
 }
 
 BT_HIDDEN
 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)
+               bt_self_component_class_source *comp_class,
+               const bt_value *params,
+               const bt_value **user_result)
 {
        enum bt_query_status status = BT_QUERY_STATUS_OK;
-       struct bt_value *result = NULL;
-       const struct bt_value *path_value = NULL;
+       bt_value *result = NULL;
+       const bt_value *path_value = NULL;
        int ret = 0;
        const char *path = NULL;
        GList *trace_paths = NULL;
@@ -522,7 +521,7 @@ enum bt_query_status trace_info_query(
                GString *trace_path = tp_node->data;
                GString *trace_name = tn_node->data;
                enum bt_value_status status;
-               struct bt_value *trace_info;
+               bt_value *trace_info;
 
                trace_info = bt_value_map_create();
                if (!trace_info) {
@@ -533,12 +532,12 @@ enum bt_query_status trace_info_query(
                ret = populate_trace_info(trace_path->str, trace_name->str,
                        trace_info);
                if (ret) {
-                       bt_object_put_ref(trace_info);
+                       bt_value_put_ref(trace_info);
                        goto error;
                }
 
                status = bt_value_array_append_element(result, trace_info);
-               bt_object_put_ref(trace_info);
+               bt_value_put_ref(trace_info);
                if (status != BT_VALUE_STATUS_OK) {
                        goto error;
                }
@@ -547,7 +546,7 @@ enum bt_query_status trace_info_query(
        goto end;
 
 error:
-       BT_OBJECT_PUT_REF_AND_RESET(result);
+       BT_VALUE_PUT_REF_AND_RESET(result);
        result = NULL;
 
        if (status >= 0) {