projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Values API: split into private and public APIs
[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 b2830a76e8a2f1d17e2eb7c4b128e91d79001ea0..eef9e9ee0f7809cf97d2f12452d424bc3f9a56c5 100644
(file)
--- a/
plugins/ctf/fs-src/query.c
+++ b/
plugins/ctf/fs-src/query.c
@@
-55,6
+55,7
@@
struct bt_component_class_query_method_return metadata_info_query(
.status = BT_QUERY_STATUS_OK,
};
.status = BT_QUERY_STATUS_OK,
};
+ struct bt_private_value *result = NULL;
struct bt_value *path_value = NULL;
char *metadata_text = NULL;
FILE *metadata_fp = NULL;
struct bt_value *path_value = NULL;
char *metadata_text = NULL;
FILE *metadata_fp = NULL;
@@
-64,12
+65,13
@@
struct bt_component_class_query_method_return metadata_info_query(
const char *path;
bool is_packetized;
const char *path;
bool is_packetized;
-
query_ret.result = bt
_value_map_create();
- if (!
query_ret.
result) {
+
result = bt_private
_value_map_create();
+ if (!result) {
query_ret.status = BT_QUERY_STATUS_NOMEM;
goto error;
}
query_ret.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_ASSERT(params);
if (!bt_value_is_map(params)) {
@@
-148,14
+150,14
@@
struct bt_component_class_query_method_return metadata_info_query(
g_string_append(g_metadata_text, metadata_text);
g_string_append(g_metadata_text, metadata_text);
- ret = bt_
value_map_insert_string_entry(query_ret.
result, "text",
+ ret = bt_
private_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;
}
g_metadata_text->str);
if (ret) {
BT_LOGE_STR("Cannot insert metadata text into query result.");
goto error;
}
- ret = bt_
value_map_insert_bool_entry(query_ret.
result, "is-packetized",
+ ret = bt_
private_value_map_insert_bool_entry(
result, "is-packetized",
is_packetized);
if (ret) {
BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
is_packetized);
if (ret) {
BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
@@
-165,7
+167,8
@@
struct bt_component_class_query_method_return metadata_info_query(
goto end;
error:
goto end;
error:
- BT_PUT(query_ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(result);
+ query_ret.result = NULL;
if (query_ret.status >= 0) {
query_ret.status = BT_QUERY_STATUS_ERROR;
if (query_ret.status >= 0) {
query_ret.status = BT_QUERY_STATUS_ERROR;
@@
-186,50
+189,52
@@
end:
}
static
}
static
-int add_range(struct bt_value *info, struct range *range,
+int add_range(struct bt_
private_
value *info, struct range *range,
const char *range_name)
{
int ret = 0;
enum bt_value_status status;
const char *range_name)
{
int ret = 0;
enum bt_value_status status;
- struct bt_value *range_map = NULL;
+ struct bt_
private_
value *range_map = NULL;
if (!range->set) {
/* Not an error. */
goto end;
}
if (!range->set) {
/* Not an error. */
goto end;
}
- range_map = bt_value_map_create();
+ range_map = bt_
private_
value_map_create();
if (!range_map) {
ret = -1;
goto end;
}
if (!range_map) {
ret = -1;
goto end;
}
- status = bt_value_map_insert_integer_entry(range_map, "begin",
+ status = bt_
private_
value_map_insert_integer_entry(range_map, "begin",
range->begin_ns);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
range->begin_ns);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
- status = bt_value_map_insert_integer_entry(range_map, "end",
+ status = bt_
private_
value_map_insert_integer_entry(range_map, "end",
range->end_ns);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
range->end_ns);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
- status = bt_value_map_insert_entry(info, range_name, range_map);
+ status = bt_private_value_map_insert_entry(info, range_name,
+ bt_value_borrow_from_private(range_map));
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
+
end:
end:
- bt_
put
(range_map);
+ bt_
object_put_ref
(range_map);
return ret;
}
static
return ret;
}
static
-int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
+int add_stream_ids(struct bt_
private_
value *info, struct bt_stream *stream)
{
int ret = 0;
int64_t stream_class_id, stream_instance_id;
{
int ret = 0;
int64_t stream_class_id, stream_instance_id;
@@
-238,7
+243,7
@@
int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
stream_instance_id = bt_stream_get_id(stream);
if (stream_instance_id != -1) {
stream_instance_id = bt_stream_get_id(stream);
if (stream_instance_id != -1) {
- status = bt_value_map_insert_integer_entry(info, "id",
+ status = bt_
private_
value_map_insert_integer_entry(info, "id",
stream_instance_id);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
stream_instance_id);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
@@
-258,7
+263,7
@@
int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
goto end;
}
goto end;
}
- status = bt_value_map_insert_integer_entry(info, "class-id", stream_class_id);
+ status = bt_
private_
value_map_insert_integer_entry(info, "class-id", stream_class_id);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
@@
-270,18
+275,18
@@
end:
static
int populate_stream_info(struct ctf_fs_ds_file_group *group,
static
int populate_stream_info(struct ctf_fs_ds_file_group *group,
- struct bt_value *group_info,
+ struct bt_
private_
value *group_info,
struct range *stream_range)
{
int ret = 0;
size_t file_idx;
enum bt_value_status status;
struct range *stream_range)
{
int ret = 0;
size_t file_idx;
enum bt_value_status status;
- struct bt_value *file_paths;
+ struct bt_
private_
value *file_paths;
stream_range->begin_ns = INT64_MAX;
stream_range->end_ns = 0;
stream_range->begin_ns = INT64_MAX;
stream_range->end_ns = 0;
- file_paths = bt_value_array_create();
+ file_paths = bt_
private_
value_array_create();
if (!file_paths) {
ret = -1;
goto end;
if (!file_paths) {
ret = -1;
goto end;
@@
-300,7
+305,7
@@
int populate_stream_info(struct ctf_fs_ds_file_group *group,
goto end;
}
goto end;
}
- status = bt_value_array_append_string_element(file_paths,
+ status = bt_
private_
value_array_append_string_element(file_paths,
info->path->str);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
info->path->str);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
@@
-328,7
+333,8
@@
int populate_stream_info(struct ctf_fs_ds_file_group *group,
}
}
}
}
- status = bt_value_map_insert_entry(group_info, "paths", file_paths);
+ status = bt_private_value_map_insert_entry(group_info, "paths",
+ bt_value_borrow_from_private(file_paths));
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
@@
-339,19
+345,19
@@
int populate_stream_info(struct ctf_fs_ds_file_group *group,
goto end;
}
end:
goto end;
}
end:
- bt_
put
(file_paths);
+ bt_
object_put_ref
(file_paths);
return ret;
}
static
int populate_trace_info(const char *trace_path, const char *trace_name,
return ret;
}
static
int populate_trace_info(const char *trace_path, const char *trace_name,
- struct bt_value *trace_info)
+ struct bt_
private_
value *trace_info)
{
int ret = 0;
size_t group_idx;
struct ctf_fs_trace *trace = NULL;
enum bt_value_status status;
{
int ret = 0;
size_t group_idx;
struct ctf_fs_trace *trace = NULL;
enum bt_value_status status;
- struct bt_value *file_groups;
+ struct bt_
private_
value *file_groups;
struct range trace_range = {
.begin_ns = INT64_MAX,
.end_ns = 0,
struct range trace_range = {
.begin_ns = INT64_MAX,
.end_ns = 0,
@@
-363,18
+369,18
@@
int populate_trace_info(const char *trace_path, const char *trace_name,
.set = false,
};
.set = false,
};
- file_groups = bt_value_array_create();
+ file_groups = bt_
private_
value_array_create();
if (!file_groups) {
goto end;
}
if (!file_groups) {
goto end;
}
- status = bt_value_map_insert_string_entry(trace_info, "name",
-
trace_name);
+ status = bt_
private_
value_map_insert_string_entry(trace_info, "name",
+ trace_name);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
- status = bt_value_map_insert_string_entry(trace_info, "path",
+ status = bt_
private_
value_map_insert_string_entry(trace_info, "path",
trace_path);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
trace_path);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
@@
-398,12
+404,12
@@
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++) {
/* 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;
+ struct bt_
private_
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);
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_value_map_create();
+ group_info = bt_
private_
value_map_create();
if (!group_info) {
ret = -1;
goto end;
if (!group_info) {
ret = -1;
goto end;
@@
-411,7
+417,7
@@
int populate_trace_info(const char *trace_path, const char *trace_name,
ret = populate_stream_info(group, group_info, &group_range);
if (ret) {
ret = populate_stream_info(group, group_info, &group_range);
if (ret) {
- bt_
put
(group_info);
+ bt_
object_put_ref
(group_info);
goto end;
}
goto end;
}
@@
-427,8
+433,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;
trace_intersection.end_ns = min(trace_intersection.end_ns,
group_range.end_ns);
trace_intersection.set = true;
- status = bt_value_array_append_element(file_groups, group_info);
- bt_put(group_info);
+ status = bt_private_value_array_append_element(
+ file_groups,
+ bt_value_borrow_from_private(group_info));
+ bt_object_put_ref(group_info);
if (status != BT_VALUE_STATUS_OK) {
goto end;
}
if (status != BT_VALUE_STATUS_OK) {
goto end;
}
@@
-448,15
+456,16
@@
int populate_trace_info(const char *trace_path, const char *trace_name,
}
}
}
}
- status = bt_value_map_insert_entry(trace_info, "streams", file_groups);
- BT_PUT(file_groups);
+ status = bt_private_value_map_insert_entry(trace_info, "streams",
+ bt_value_borrow_from_private(file_groups));
+ BT_OBJECT_PUT_REF_AND_RESET(file_groups);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
end:
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;
}
ctf_fs_trace_destroy(trace);
return ret;
}
@@
-471,6
+480,7
@@
struct bt_component_class_query_method_return trace_info_query(
.status = BT_QUERY_STATUS_OK,
};
.status = BT_QUERY_STATUS_OK,
};
+ struct bt_private_value *result = NULL;
struct bt_value *path_value = NULL;
int ret = 0;
const char *path = NULL;
struct bt_value *path_value = NULL;
int ret = 0;
const char *path = NULL;
@@
-515,12
+525,14
@@
struct bt_component_class_query_method_return trace_info_query(
goto error;
}
goto error;
}
-
query_ret.result = bt
_value_array_create();
- if (!
query_ret.
result) {
+
result = bt_private
_value_array_create();
+ if (!result) {
query_ret.status = BT_QUERY_STATUS_NOMEM;
goto error;
}
query_ret.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),
/* 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),
@@
-528,9
+540,9
@@
struct bt_component_class_query_method_return trace_info_query(
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
enum bt_value_status status;
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
enum bt_value_status status;
- struct bt_value *trace_info;
+ struct bt_
private_
value *trace_info;
- trace_info = bt_value_map_create();
+ trace_info = bt_
private_
value_map_create();
if (!trace_info) {
BT_LOGE("Failed to create trace info map.");
goto error;
if (!trace_info) {
BT_LOGE("Failed to create trace info map.");
goto error;
@@
-539,12
+551,13
@@
struct bt_component_class_query_method_return trace_info_query(
ret = populate_trace_info(trace_path->str, trace_name->str,
trace_info);
if (ret) {
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;
}
goto error;
}
- status = bt_value_array_append_element(query_ret.result, trace_info);
- bt_put(trace_info);
+ status = bt_private_value_array_append_element(result,
+ bt_value_borrow_from_private(trace_info));
+ bt_object_put_ref(trace_info);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
@@
-553,7
+566,8
@@
struct bt_component_class_query_method_return trace_info_query(
goto end;
error:
goto end;
error:
- BT_PUT(query_ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(result);
+ query_ret.result = NULL;
if (query_ret.status >= 0) {
query_ret.status = BT_QUERY_STATUS_ERROR;
if (query_ret.status >= 0) {
query_ret.status = BT_QUERY_STATUS_ERROR;
This page took
0.029834 seconds
and
4
git commands to generate.