};
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_private_value *result = NULL;
- 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;
const char *path;
bool is_packetized;
- result = bt_private_value_map_create();
+ result = bt_value_map_create();
if (!result) {
- query_ret.status = BT_QUERY_STATUS_NOMEM;
+ status = BT_QUERY_STATUS_NOMEM;
goto error;
}
- query_ret.result = bt_value_borrow_from_private(result);
BT_ASSERT(params);
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_entry_value(params, "path");
+ path_value = bt_value_map_borrow_entry_value_const(params, "path");
path = bt_value_string_get(path_value);
BT_ASSERT(path);
g_string_append(g_metadata_text, metadata_text);
- ret = bt_private_value_map_insert_string_entry(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_private_value_map_insert_bool_entry(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.");
error:
BT_OBJECT_PUT_REF_AND_RESET(result);
- query_ret.result = NULL;
+ result = NULL;
- if (query_ret.status >= 0) {
- query_ret.status = BT_QUERY_STATUS_ERROR;
+ if (status >= 0) {
+ status = BT_QUERY_STATUS_ERROR;
}
end:
fclose(metadata_fp);
}
- return query_ret;
+ *user_result = result;
+ return status;
}
static
-int add_range(struct bt_private_value *info, struct range *range,
+int add_range(struct bt_value *info, struct range *range,
const char *range_name)
{
int ret = 0;
enum bt_value_status status;
- struct bt_private_value *range_map = NULL;
+ struct bt_value *range_map = NULL;
if (!range->set) {
/* Not an error. */
goto end;
}
- range_map = bt_private_value_map_create();
+ range_map = bt_value_map_create();
if (!range_map) {
ret = -1;
goto end;
}
- status = bt_private_value_map_insert_integer_entry(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_private_value_map_insert_integer_entry(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_private_value_map_insert_entry(info, range_name,
- bt_value_borrow_from_private(range_map));
+ status = bt_value_map_insert_entry(info, range_name,
+ range_map);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
static
-int add_stream_ids(struct bt_private_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_private_value_map_insert_integer_entry(info, "id",
+ status = bt_value_map_insert_integer_entry(info, "id",
stream_instance_id);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
}
}
- stream_class = bt_stream_borrow_class(stream);
+ stream_class = bt_stream_borrow_class_const(stream);
if (!stream_class) {
ret = -1;
goto end;
goto end;
}
- status = bt_private_value_map_insert_integer_entry(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;
static
int populate_stream_info(struct ctf_fs_ds_file_group *group,
- struct bt_private_value *group_info,
- struct range *stream_range)
+ struct bt_value *group_info, struct range *stream_range)
{
int ret = 0;
size_t file_idx;
enum bt_value_status status;
- struct bt_private_value *file_paths;
+ struct bt_value *file_paths;
stream_range->begin_ns = INT64_MAX;
stream_range->end_ns = 0;
- file_paths = bt_private_value_array_create();
+ file_paths = bt_value_array_create();
if (!file_paths) {
ret = -1;
goto end;
goto end;
}
- status = bt_private_value_array_append_string_element(file_paths,
+ status = bt_value_array_append_string_element(file_paths,
info->path->str);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
}
}
- status = bt_private_value_map_insert_entry(group_info, "paths",
- bt_value_borrow_from_private(file_paths));
+ status = bt_value_map_insert_entry(group_info, "paths",
+ file_paths);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
static
int populate_trace_info(const char *trace_path, const char *trace_name,
- struct bt_private_value *trace_info)
+ struct bt_value *trace_info)
{
int ret = 0;
size_t group_idx;
struct ctf_fs_trace *trace = NULL;
enum bt_value_status status;
- struct bt_private_value *file_groups;
+ struct bt_value *file_groups;
struct range trace_range = {
.begin_ns = INT64_MAX,
.end_ns = 0,
.set = false,
};
- file_groups = bt_private_value_array_create();
+ file_groups = bt_value_array_create();
if (!file_groups) {
goto end;
}
- status = bt_private_value_map_insert_string_entry(trace_info, "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_private_value_map_insert_string_entry(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;
/* 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_private_value *group_info;
+ struct 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);
- group_info = bt_private_value_map_create();
+ group_info = bt_value_map_create();
if (!group_info) {
ret = -1;
goto end;
trace_intersection.end_ns = min(trace_intersection.end_ns,
group_range.end_ns);
trace_intersection.set = true;
- status = bt_private_value_array_append_element(
+ status = bt_value_array_append_element(
file_groups,
- bt_value_borrow_from_private(group_info));
+ group_info);
bt_object_put_ref(group_info);
if (status != BT_VALUE_STATUS_OK) {
goto end;
}
}
- status = bt_private_value_map_insert_entry(trace_info, "streams",
- bt_value_borrow_from_private(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;
}
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_private_value *result = NULL;
- 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;
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_entry_value(params, "path");
+ 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);
goto error;
}
- result = bt_private_value_array_create();
+ result = bt_value_array_create();
if (!result) {
- query_ret.status = BT_QUERY_STATUS_NOMEM;
+ status = BT_QUERY_STATUS_NOMEM;
goto error;
}
- query_ret.result = bt_value_borrow_from_private(result);
-
/* Iterates over both trace paths and names simultaneously. */
for (tp_node = trace_paths, tn_node = trace_names; tp_node;
tp_node = g_list_next(tp_node),
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
enum bt_value_status status;
- struct bt_private_value *trace_info;
+ struct bt_value *trace_info;
- trace_info = bt_private_value_map_create();
+ trace_info = bt_value_map_create();
if (!trace_info) {
BT_LOGE("Failed to create trace info map.");
goto error;
goto error;
}
- status = bt_private_value_array_append_element(result,
- bt_value_borrow_from_private(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;
error:
BT_OBJECT_PUT_REF_AND_RESET(result);
- query_ret.result = NULL;
+ result = NULL;
- if (query_ret.status >= 0) {
- query_ret.status = BT_QUERY_STATUS_ERROR;
+ if (status >= 0) {
+ status = BT_QUERY_STATUS_ERROR;
}
end:
}
g_list_free(trace_names);
}
- /* "path" becomes invalid with the release of path_value. */
- return query_ret;
+
+ *user_result = result;
+ return status;
}
projects / babeltrace.git / blobdiff