*/
#include <stdlib.h>
-#include <babeltrace/values.h>
-#include <babeltrace/private-values.h>
+#include <babeltrace/babeltrace.h>
#include <babeltrace/common-internal.h>
#include "babeltrace-cfg.h"
#include "babeltrace-cfg-cli-args-connect.h"
struct bt_config_component *comp = g_ptr_array_index(comps, i);
if (strcmp(name, comp->instance_name->str) == 0) {
- found_comp = bt_object_get_ref(comp);
+ found_comp = comp;
+ bt_object_get_ref(found_comp);
goto end;
}
}
}
static int validate_all_components_connected_in_array(GPtrArray *comps,
- struct bt_value *connected_components,
+ const bt_value *connected_components,
char *error_buf, size_t error_buf_size)
{
int ret = 0;
{
size_t i;
int ret = 0;
- struct bt_private_value *connected_components =
- bt_private_value_map_create();
+ bt_value *connected_components = bt_value_map_create();
if (!connected_components) {
ret = -1;
struct bt_config_connection *connection =
g_ptr_array_index(cfg->cmd_data.run.connections, i);
- ret = bt_private_value_map_insert_entry(connected_components,
+ ret = bt_value_map_insert_entry(connected_components,
connection->upstream_comp_name->str, bt_value_null);
if (ret) {
goto end;
}
- ret = bt_private_value_map_insert_entry(connected_components,
+ ret = bt_value_map_insert_entry(connected_components,
connection->downstream_comp_name->str, bt_value_null);
if (ret) {
goto end;
ret = validate_all_components_connected_in_array(
cfg->cmd_data.run.sources,
- bt_value_borrow_from_private(connected_components),
+ connected_components,
error_buf, error_buf_size);
if (ret) {
goto end;
ret = validate_all_components_connected_in_array(
cfg->cmd_data.run.filters,
- bt_value_borrow_from_private(connected_components),
+ connected_components,
error_buf, error_buf_size);
if (ret) {
goto end;
ret = validate_all_components_connected_in_array(
cfg->cmd_data.run.sinks,
- bt_value_borrow_from_private(connected_components),
+ connected_components,
error_buf, error_buf_size);
if (ret) {
goto end;
}
end:
- bt_object_put_ref(connected_components);
+ bt_value_put_ref(connected_components);
return ret;
}
{
size_t i;
int ret = 0;
- struct bt_private_value *flat_connection_names =
- bt_private_value_map_create();
+ bt_value *flat_connection_names =
+ bt_value_map_create();
GString *flat_connection_name = NULL;
if (!flat_connection_names) {
connection->downstream_comp_name->str,
connection->downstream_port_glob->str);
- if (bt_value_map_has_entry(bt_value_borrow_from_private(
- flat_connection_names),
- flat_connection_name->str)) {
+ if (bt_value_map_has_entry(flat_connection_names,
+ flat_connection_name->str)) {
snprintf(error_buf, error_buf_size,
"Duplicate connection:\n %s\n",
connection->arg->str);
goto end;
}
- ret = bt_private_value_map_insert_entry(flat_connection_names,
+ ret = bt_value_map_insert_entry(flat_connection_names,
flat_connection_name->str, bt_value_null);
if (ret) {
goto end;
}
end:
- bt_object_put_ref(flat_connection_names);
+ bt_value_put_ref(flat_connection_names);
if (flat_connection_name) {
g_string_free(flat_connection_name, TRUE);
}
int bt_config_cli_args_create_connections(struct bt_config *cfg,
- struct bt_value *connection_args,
+ const bt_value *connection_args,
char *error_buf, size_t error_buf_size)
{
int ret;
}
for (i = 0; i < bt_value_array_get_size(connection_args); i++) {
- struct bt_value *arg_value =
- bt_value_array_borrow_element_by_index(
+ const bt_value *arg_value =
+ bt_value_array_borrow_element_by_index_const(
connection_args, i);
const char *arg;
struct bt_config_connection *cfg_connection;