static
int query(struct bt_component_class *comp_cls, const char *obj,
- struct bt_value *params, struct bt_value **user_result,
+ const struct bt_value *params, const struct bt_value **user_result,
const char **fail_reason)
{
- struct bt_value *result = NULL;
+ const struct bt_value *result = NULL;
enum bt_query_executor_status status;
*fail_reason = "unknown error";
int ret = 0;
}
static
-void print_value(FILE *, struct bt_value *, size_t);
+void print_value(FILE *, const struct bt_value *, size_t);
static
-void print_value_rec(FILE *, struct bt_value *, size_t);
+void print_value_rec(FILE *, const struct bt_value *, size_t);
struct print_map_value_data {
size_t indent;
};
static
-bt_bool print_map_value(const char *key, struct bt_value *object, void *data)
+bt_bool print_map_value(const char *key, const struct bt_value *object,
+ void *data)
{
struct print_map_value_data *print_map_value_data = data;
}
static
-void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
+void print_value_rec(FILE *fp, const struct bt_value *value, size_t indent)
{
bt_bool bool_val;
int64_t int_val;
}
for (i = 0; i < size; i++) {
- struct bt_value *element =
- bt_value_array_borrow_element_by_index(
+ const struct bt_value *element =
+ bt_value_array_borrow_element_by_index_const(
value, i);
if (!element) {
break;
}
- bt_value_map_foreach_entry(value, print_map_value, &data);
+ bt_value_map_foreach_entry_const(value, print_map_value, &data);
break;
}
default:
}
static
-void print_value(FILE *fp, struct bt_value *value, size_t indent)
+void print_value(FILE *fp, const struct bt_value *value, size_t indent)
{
if (!bt_value_is_array(value) && !bt_value_is_map(value)) {
print_indent(fp, indent);
}
fprintf(stderr, " Parameters:\n");
- print_value(stderr,
- bt_private_value_as_value(bt_config_component->params), 8);
+ print_value(stderr, bt_config_component->params, 8);
}
static
}
static
-void print_plugin_paths(struct bt_value *plugin_paths)
+void print_plugin_paths(const struct bt_value *plugin_paths)
{
fprintf(stderr, " Plugin paths:\n");
print_value(stderr, plugin_paths, 4);
{
size_t i;
- print_plugin_paths(bt_private_value_as_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
fprintf(stderr, " Source component instances:\n");
print_bt_config_components(cfg->cmd_data.run.sources);
static
void print_cfg_list_plugins(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_as_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
}
static
void print_cfg_help(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_as_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
}
static
void print_cfg_print_ctf_metadata(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_as_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
fprintf(stderr, " Path: %s\n",
cfg->cmd_data.print_ctf_metadata.path->str);
}
static
void print_cfg_print_lttng_live_sessions(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_as_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
fprintf(stderr, " URL: %s\n",
cfg->cmd_data.print_lttng_live_sessions.url->str);
}
static
void print_cfg_query(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_as_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
fprintf(stderr, " Object: `%s`\n", cfg->cmd_data.query.object->str);
fprintf(stderr, " Component class:\n");
print_bt_config_component(cfg->cmd_data.query.cfg_component);
}
static
-int load_dynamic_plugins(struct bt_value *plugin_paths)
+int load_dynamic_plugins(const struct bt_value *plugin_paths)
{
int nr_paths, i, ret = 0;
BT_LOGI("Loading dynamic plugins.");
for (i = 0; i < nr_paths; i++) {
- struct bt_value *plugin_path_value = NULL;
+ const struct bt_value *plugin_path_value = NULL;
const char *plugin_path;
struct bt_plugin_set *plugin_set;
- plugin_path_value = bt_value_array_borrow_element_by_index(
- plugin_paths, i);
+ plugin_path_value =
+ bt_value_array_borrow_element_by_index_const(
+ plugin_paths, i);
plugin_path = bt_value_string_get(plugin_path_value);
/*
}
static
-int load_all_plugins(struct bt_value *plugin_paths)
+int load_all_plugins(const struct bt_value *plugin_paths)
{
int ret = 0;
{
int ret = 0;
struct bt_component_class *comp_cls = NULL;
- struct bt_value *results = NULL;
+ const struct bt_value *results = NULL;
const char *fail_reason = NULL;
comp_cls = find_component_class(
}
ret = query(comp_cls, cfg->cmd_data.query.object->str,
- bt_private_value_as_value(
- cfg->cmd_data.query.cfg_component->params),
+ cfg->cmd_data.query.cfg_component->params,
&results, &fail_reason);
if (ret) {
goto failed;
int plugins_count, component_classes_count = 0, i;
printf("From the following plugin paths:\n\n");
- print_value(stdout, bt_private_value_as_value(cfg->plugin_paths), 2);
+ print_value(stdout, cfg->plugin_paths, 2);
printf("\n");
plugins_count = loaded_plugins->len;
if (plugins_count == 0) {
{
int ret = 0;
struct bt_component_class *comp_cls = NULL;
- struct bt_value *results = NULL;
- struct bt_private_value *params = NULL;
- struct bt_value *map = NULL;
- struct bt_value *v = NULL;
+ const struct bt_value *results = NULL;
+ struct bt_value *params = NULL;
+ const struct bt_value *map = NULL;
+ const struct bt_value *v = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "lttng-live";
static const enum bt_component_class_type comp_cls_type =
goto error;
}
- params = bt_private_value_map_create();
+ params = bt_value_map_create();
if (!params) {
goto error;
}
- ret = bt_private_value_map_insert_string_entry(params, "url",
+ ret = bt_value_map_insert_string_entry(params, "url",
cfg->cmd_data.print_lttng_live_sessions.url->str);
if (ret) {
goto error;
}
- ret = query(comp_cls, "sessions", bt_private_value_as_value(params),
- &results, &fail_reason);
+ ret = query(comp_cls, "sessions", params,
+ &results, &fail_reason);
if (ret) {
goto failed;
}
const char *url_text;
int64_t timer_us, streams, clients;
- map = bt_value_array_borrow_element_by_index(results, i);
+ map = bt_value_array_borrow_element_by_index_const(results, i);
if (!map) {
BT_LOGE_STR("Unexpected empty array entry.");
goto error;
goto error;
}
- v = bt_value_map_borrow_entry_value(map, "url");
+ v = bt_value_map_borrow_entry_value_const(map, "url");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"url\" entry.");
goto error;
}
url_text = bt_value_string_get(v);
fprintf(out_stream, "%s", url_text);
- v = bt_value_map_borrow_entry_value(map, "timer-us");
+ v = bt_value_map_borrow_entry_value_const(map, "timer-us");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"timer-us\" entry.");
goto error;
}
timer_us = bt_value_integer_get(v);
fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us);
- v = bt_value_map_borrow_entry_value(map, "stream-count");
+ v = bt_value_map_borrow_entry_value_const(map, "stream-count");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"stream-count\" entry.");
goto error;
}
streams = bt_value_integer_get(v);
fprintf(out_stream, "%" PRIu64 " stream(s), ", streams);
- v = bt_value_map_borrow_entry_value(map, "client-count");
+ v = bt_value_map_borrow_entry_value_const(map, "client-count");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"client-count\" entry.");
goto error;
{
int ret = 0;
struct bt_component_class *comp_cls = NULL;
- struct bt_value *results = NULL;
- struct bt_private_value *params = NULL;
- struct bt_value *metadata_text_value = NULL;
+ const struct bt_value *results = NULL;
+ struct bt_value *params = NULL;
+ const struct bt_value *metadata_text_value = NULL;
const char *metadata_text = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "fs";
goto end;
}
- params = bt_private_value_map_create();
+ params = bt_value_map_create();
if (!params) {
ret = -1;
goto end;
}
- ret = bt_private_value_map_insert_string_entry(params, "path",
+ ret = bt_value_map_insert_string_entry(params, "path",
cfg->cmd_data.print_ctf_metadata.path->str);
if (ret) {
ret = -1;
}
ret = query(comp_cls, "metadata-info",
- bt_private_value_as_value(params), &results, &fail_reason);
+ params, &results, &fail_reason);
if (ret) {
goto failed;
}
- metadata_text_value = bt_value_map_borrow_entry_value(results, "text");
+ metadata_text_value = bt_value_map_borrow_entry_value_const(results,
+ "text");
if (!metadata_text_value) {
BT_LOGE_STR("Cannot find `text` string value in the resulting metadata info object.");
ret = -1;
borrow_input_port_by_index_func_t port_by_index_fn;
enum bt_graph_status status = BT_GRAPH_STATUS_ERROR;
bool insert_trimmer = false;
- struct bt_private_value *trimmer_params = NULL;
+ struct bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
char *intersection_end = NULL;
struct bt_component_filter *trimmer = NULL;
}
insert_trimmer = true;
- trimmer_params = bt_private_value_map_create();
+ trimmer_params = bt_value_map_create();
if (!trimmer_params) {
goto error;
}
- status = bt_private_value_map_insert_string_entry(
+ status = bt_value_map_insert_string_entry(
trimmer_params, "begin", intersection_begin);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
- status = bt_private_value_map_insert_string_entry(
+ status = bt_value_map_insert_string_entry(
trimmer_params,
"end", intersection_end);
if (status != BT_VALUE_STATUS_OK) {
ctx->connect_ports = false;
graph_status = bt_private_graph_add_filter_component(
ctx->graph, trimmer_class, trimmer_name,
- bt_private_value_as_value(trimmer_params),
+ trimmer_params,
&trimmer);
free(trimmer_name);
if (graph_status != BT_GRAPH_STATUS_OK) {
int64_t trace_count;
enum bt_value_status value_status;
const char *path = NULL;
- struct bt_value *component_path_value = NULL;
- struct bt_private_value *query_params = NULL;
- struct bt_value *query_result = NULL;
- struct bt_value *trace_info = NULL;
- struct bt_value *intersection_range = NULL;
- struct bt_value *intersection_begin = NULL;
- struct bt_value *intersection_end = NULL;
- struct bt_value *stream_path_value = NULL;
- struct bt_value *stream_paths = NULL;
- struct bt_value *stream_infos = NULL;
- struct bt_value *stream_info = NULL;
+ const struct bt_value *component_path_value = NULL;
+ struct bt_value *query_params = NULL;
+ const struct bt_value *query_result = NULL;
+ const struct bt_value *trace_info = NULL;
+ const struct bt_value *intersection_range = NULL;
+ const struct bt_value *intersection_begin = NULL;
+ const struct bt_value *intersection_end = NULL;
+ const struct bt_value *stream_path_value = NULL;
+ const struct bt_value *stream_paths = NULL;
+ const struct bt_value *stream_infos = NULL;
+ const struct bt_value *stream_info = NULL;
struct port_id *port_id = NULL;
struct trace_range *trace_range = NULL;
const char *fail_reason = NULL;
struct bt_component_class *comp_cls =
bt_component_class_source_as_component_class(src_comp_cls);
- component_path_value = bt_value_map_borrow_entry_value(
- bt_private_value_as_value(cfg_comp->params),
- "path");
+ component_path_value = bt_value_map_borrow_entry_value(cfg_comp->params,
+ "path");
if (component_path_value && !bt_value_is_string(component_path_value)) {
BT_LOGD("Cannot get path parameter: component-name=%s",
cfg_comp->instance_name->str);
}
path = bt_value_string_get(component_path_value);
- query_params = bt_private_value_map_create();
+ query_params = bt_value_map_create();
if (!query_params) {
BT_LOGE_STR("Cannot create query parameters.");
ret = -1;
goto error;
}
- value_status = bt_private_value_map_insert_entry(query_params, "path",
- component_path_value);
+ value_status = bt_value_map_insert_string_entry(query_params, "path",
+ path);
if (value_status != BT_VALUE_STATUS_OK) {
BT_LOGE_STR("Cannot insert path parameter in query parameter map.");
ret = -1;
}
ret = query(comp_cls, "trace-info",
- bt_private_value_as_value(query_params), &query_result,
+ query_params, &query_result,
&fail_reason);
if (ret) {
BT_LOGD("Component class does not support the `trace-info` query: %s: "
uint64_t stream_idx;
int64_t stream_count;
- trace_info = bt_value_array_borrow_element_by_index(
+ trace_info = bt_value_array_borrow_element_by_index_const(
query_result, trace_idx);
if (!trace_info || !bt_value_is_map(trace_info)) {
ret = -1;
goto error;
}
- intersection_range = bt_value_map_borrow_entry_value(trace_info,
- "intersection-range-ns");
+ intersection_range = bt_value_map_borrow_entry_value_const(
+ trace_info, "intersection-range-ns");
if (!intersection_range) {
ret = -1;
BT_LOGD_STR("Cannot retrieve \'intersetion-range-ns\' field from query result.");
goto error;
}
- intersection_begin = bt_value_map_borrow_entry_value(
- intersection_range, "begin");
+ intersection_begin = bt_value_map_borrow_entry_value_const(intersection_range,
+ "begin");
if (!intersection_begin) {
ret = -1;
BT_LOGD_STR("Cannot retrieve intersection-range-ns \'begin\' field from query result.");
goto error;
}
- intersection_end = bt_value_map_borrow_entry_value(
- intersection_range, "end");
+ intersection_end = bt_value_map_borrow_entry_value_const(intersection_range,
+ "end");
if (!intersection_end) {
ret = -1;
BT_LOGD_STR("Cannot retrieve intersection-range-ns \'end\' field from query result.");
goto error;
}
- stream_infos = bt_value_map_borrow_entry_value(trace_info,
- "streams");
+ stream_infos = bt_value_map_borrow_entry_value_const(trace_info,
+ "streams");
if (!stream_infos || !bt_value_is_array(stream_infos)) {
ret = -1;
BT_LOGD_STR("Cannot retrieve stream information from trace in query result.");
trace_range->intersection_range_begin_ns = begin;
trace_range->intersection_range_end_ns = end;
- stream_info = bt_value_array_borrow_element_by_index(
+ stream_info = bt_value_array_borrow_element_by_index_const(
stream_infos, stream_idx);
if (!stream_info || !bt_value_is_map(stream_info)) {
ret = -1;
goto error;
}
- stream_paths = bt_value_map_borrow_entry_value(
- stream_info, "paths");
+ stream_paths = bt_value_map_borrow_entry_value_const(stream_info,
+ "paths");
if (!stream_paths || !bt_value_is_array(stream_paths)) {
ret = -1;
BT_LOGD_STR("Cannot retrieve stream paths from trace in query result.");
}
stream_path_value =
- bt_value_array_borrow_element_by_index(
+ bt_value_array_borrow_element_by_index_const(
stream_paths, 0);
if (!stream_path_value ||
!bt_value_is_string(stream_path_value)) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
ret = bt_private_graph_add_source_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
- bt_private_value_as_value(cfg_comp->params),
+ cfg_comp->params,
(void *) &comp);
break;
case BT_COMPONENT_CLASS_TYPE_FILTER:
ret = bt_private_graph_add_filter_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
- bt_private_value_as_value(cfg_comp->params),
+ cfg_comp->params,
(void *) &comp);
break;
case BT_COMPONENT_CLASS_TYPE_SINK:
ret = bt_private_graph_add_sink_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
- bt_private_value_as_value(cfg_comp->params),
+ cfg_comp->params,
(void *) &comp);
break;
default:
print_cfg(cfg);
if (cfg->command_needs_plugins) {
- ret = load_all_plugins(
- bt_private_value_as_value(cfg->plugin_paths));
+ ret = load_all_plugins(cfg->plugin_paths);
if (ret) {
BT_LOGE("Failed to load plugins: ret=%d", ret);
retcode = 1;