goto error;
}
- path_value = bt_value_map_borrow(params, "path");
+ path_value = bt_value_map_borrow_entry_value(params, "path");
ret = bt_value_string_get(path_value, &path);
if (ret) {
BT_LOGE_STR("Cannot get `path` string parameter.");
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(query_ret.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(query_ret.result, "is-packetized",
is_packetized);
if (ret) {
BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
goto end;
error:
- BT_PUT(query_ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(query_ret.result);
if (query_ret.status >= 0) {
query_ret.status = BT_QUERY_STATUS_ERROR;
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;
}
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;
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;
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;
}
}
- 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;
goto end;
}
end:
- bt_put(file_paths);
+ bt_object_put_ref(file_paths);
return ret;
}
goto end;
}
- status = bt_value_map_insert_string(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_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;
ret = populate_stream_info(group, group_info, &group_range);
if (ret) {
- bt_put(group_info);
+ bt_object_put_ref(group_info);
goto end;
}
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;
}
}
}
- 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;
}
goto error;
}
- path_value = bt_value_map_borrow(params, "path");
+ path_value = bt_value_map_borrow_entry_value(params, "path");
ret = bt_value_string_get(path_value, &path);
if (ret) {
BT_LOGE("Cannot get `path` string parameter.");
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(query_ret.result, trace_info);
+ bt_object_put_ref(trace_info);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
goto end;
error:
- BT_PUT(query_ret.result);
+ BT_OBJECT_PUT_REF_AND_RESET(query_ret.result);
if (query_ret.status >= 0) {
query_ret.status = BT_QUERY_STATUS_ERROR;