#include <babeltrace/babeltrace.h>
#include <babeltrace/common-internal.h>
#include <babeltrace/values.h>
+#include <babeltrace/private-values.h>
#include <popt.h>
#include <glib.h>
#include <sys/types.h>
GScanner *scanner;
/* Output map value object being filled (owned by this) */
- struct bt_value *params;
+ struct bt_private_value *params;
/* Next expected FSM state */
enum ini_parsing_fsm_state expecting;
goto error;
}
- if (bt_value_map_has_key(state->params, state->last_map_key)) {
+ if (bt_value_map_has_entry(
+ bt_value_borrow_from_private(state->params),
+ state->last_map_key)) {
g_string_append_printf(state->ini_error,
"Duplicate parameter key: `%s`\n",
state->last_map_key);
goto error;
}
- value = bt_value_integer_create_init(
- (int64_t) int_val);
+ value = bt_value_borrow_from_private(
+ bt_private_value_integer_create_init(
+ (int64_t) int_val));
break;
}
case G_TOKEN_FLOAT:
/* Positive floating point number */
- value = bt_value_float_create_init(
- state->scanner->value.v_float);
+ value = bt_value_borrow_from_private(
+ bt_private_value_real_create_init(
+ state->scanner->value.v_float));
break;
case G_TOKEN_STRING:
/* Quoted string */
- value = bt_value_string_create_init(
- state->scanner->value.v_string);
+ value = bt_value_borrow_from_private(
+ bt_private_value_string_create_init(
+ state->scanner->value.v_string));
break;
case G_TOKEN_IDENTIFIER:
{
} else if (!strcmp(id, "true") || !strcmp(id, "TRUE") ||
!strcmp(id, "yes") ||
!strcmp(id, "YES")) {
- value = bt_value_bool_create_init(true);
+ value = bt_value_borrow_from_private(
+ bt_private_value_bool_create_init(true));
} else if (!strcmp(id, "false") ||
!strcmp(id, "FALSE") ||
!strcmp(id, "no") ||
!strcmp(id, "NO")) {
- value = bt_value_bool_create_init(false);
+ value = bt_value_borrow_from_private(
+ bt_private_value_bool_create_init(false));
} else {
- value = bt_value_string_create_init(id);
+ value = bt_value_borrow_from_private(
+ bt_private_value_string_create_init(id));
}
break;
}
goto error;
}
- value = bt_value_integer_create_init(
- -((int64_t) int_val));
+ value = bt_value_borrow_from_private(
+ bt_private_value_integer_create_init(
+ -((int64_t) int_val)));
break;
}
case G_TOKEN_FLOAT:
/* Negative floating point number */
- value = bt_value_float_create_init(
- -state->scanner->value.v_float);
+ value = bt_value_borrow_from_private(
+ bt_private_value_real_create_init(
+ -state->scanner->value.v_float));
break;
default:
/* Unset value variable will trigger the error */
success:
if (value) {
- if (bt_value_map_insert(state->params,
+ if (bt_private_value_map_insert_entry(state->params,
state->last_map_key, value)) {
/* Only override return value on error */
ret = -1;
}
end:
- BT_PUT(value);
+ BT_OBJECT_PUT_REF_AND_RESET(value);
return ret;
}
* Return value is owned by the caller.
*/
static
-struct bt_value *bt_value_from_ini(const char *arg, GString *ini_error)
+struct bt_private_value *bt_private_value_from_ini(const char *arg,
+ GString *ini_error)
{
/* Lexical scanner configuration */
GScannerConfig scanner_config = {
.ini_error = ini_error,
};
- state.params = bt_value_map_create();
+ state.params = bt_private_value_map_create();
if (!state.params) {
goto error;
}
goto end;
error:
- BT_PUT(state.params);
+ BT_OBJECT_PUT_REF_AND_RESET(state.params);
end:
if (state.scanner) {
* Return value is owned by the caller.
*/
static
-struct bt_value *bt_value_from_arg(const char *arg)
+struct bt_private_value *bt_private_value_from_arg(const char *arg)
{
- struct bt_value *params = NULL;
+ struct bt_private_value *params = NULL;
GString *ini_error = NULL;
ini_error = g_string_new(NULL);
}
/* Try INI-style parsing */
- params = bt_value_from_ini(arg, ini_error);
+ params = bt_private_value_from_ini(arg, ini_error);
if (!params) {
printf_err("%s", ini_error->str);
goto end;
if (ini_error) {
g_string_free(ini_error, TRUE);
}
+
return params;
}
g_string_free(bt_config_component->instance_name, TRUE);
}
- BT_PUT(bt_config_component->params);
+ BT_OBJECT_PUT_REF_AND_RESET(bt_config_component->params);
g_free(bt_config_component);
end:
}
/* Start with empty parameters */
- cfg_component->params = bt_value_map_create();
+ cfg_component->params = bt_private_value_map_create();
if (!cfg_component->params) {
print_err_oom();
goto error;
goto end;
error:
- BT_PUT(cfg_component);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg_component);
end:
return cfg_component;
goto end;
error:
- BT_PUT(cfg_comp);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg_comp);
end:
g_free(name);
goto end;
}
- BT_PUT(cfg->plugin_paths);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg->plugin_paths);
switch (cfg->command) {
case BT_CONFIG_COMMAND_RUN:
case BT_CONFIG_COMMAND_LIST_PLUGINS:
break;
case BT_CONFIG_COMMAND_HELP:
- BT_PUT(cfg->cmd_data.help.cfg_component);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg->cmd_data.help.cfg_component);
break;
case BT_CONFIG_COMMAND_QUERY:
- BT_PUT(cfg->cmd_data.query.cfg_component);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg->cmd_data.query.cfg_component);
if (cfg->cmd_data.query.object) {
g_string_free(cfg->cmd_data.query.object, TRUE);
* Return value is owned by the caller.
*/
static
-struct bt_value *names_from_arg(const char *arg)
+struct bt_private_value *names_from_arg(const char *arg)
{
GScanner *scanner = NULL;
- struct bt_value *names = NULL;
+ struct bt_private_value *names = NULL;
bool found_all = false, found_none = false, found_item = false;
- names = bt_value_array_create();
+ names = bt_private_value_array_create();
if (!names) {
print_err_oom();
goto error;
!strcmp(identifier, "args") ||
!strcmp(identifier, "arg")) {
found_item = true;
- if (bt_value_array_append_string(names,
+ if (bt_private_value_array_append_string_element(names,
"payload")) {
goto error;
}
} else if (!strcmp(identifier, "context") ||
!strcmp(identifier, "ctx")) {
found_item = true;
- if (bt_value_array_append_string(names,
+ if (bt_private_value_array_append_string_element(names,
"context")) {
goto error;
}
} else if (!strcmp(identifier, "scope") ||
!strcmp(identifier, "header")) {
found_item = true;
- if (bt_value_array_append_string(names,
+ if (bt_private_value_array_append_string_element(names,
identifier)) {
goto error;
}
} else if (!strcmp(identifier, "all")) {
found_all = true;
- if (bt_value_array_append_string(names,
+ if (bt_private_value_array_append_string_element(names,
identifier)) {
goto error;
}
} else if (!strcmp(identifier, "none")) {
found_none = true;
- if (bt_value_array_append_string(names,
+ if (bt_private_value_array_append_string_element(names,
identifier)) {
goto error;
}
* least one item is specified.
*/
if (found_item && !found_none && !found_all) {
- if (bt_value_array_append_string(names, "none")) {
+ if (bt_private_value_array_append_string_element(names, "none")) {
goto error;
}
}
return names;
error:
- BT_PUT(names);
+ BT_OBJECT_PUT_REF_AND_RESET(names);
if (scanner) {
g_scanner_destroy(scanner);
}
* Return value is owned by the caller.
*/
static
-struct bt_value *fields_from_arg(const char *arg)
+struct bt_private_value *fields_from_arg(const char *arg)
{
GScanner *scanner = NULL;
- struct bt_value *fields;
+ struct bt_private_value *fields;
- fields = bt_value_array_create();
+ fields = bt_private_value_array_create();
if (!fields) {
print_err_oom();
goto error;
!strcmp(identifier, "emf") ||
!strcmp(identifier, "callsite") ||
!strcmp(identifier, "all")) {
- if (bt_value_array_append_string(fields,
+ if (bt_private_value_array_append_string_element(fields,
identifier)) {
goto error;
}
goto end;
error:
- BT_PUT(fields);
+ BT_OBJECT_PUT_REF_AND_RESET(fields);
end:
if (scanner) {
goto end;
}
- for (i = 0; i < bt_value_array_size(names_array); i++) {
- struct bt_value *str_obj = bt_value_array_get(names_array, i);
+ for (i = 0; i < bt_value_array_get_size(names_array); i++) {
+ struct bt_value *str_obj =
+ bt_value_array_borrow_element_by_index(names_array, i);
const char *suffix;
bool is_default = false;
goto end;
}
- ret = bt_value_string_get(str_obj, &suffix);
- BT_PUT(str_obj);
- if (ret) {
- printf_err("Unexpected error\n");
- goto end;
- }
+ suffix = bt_value_string_get(str_obj);
g_string_assign(tmpstr, prefix);
g_string_append(tmpstr, "-");
struct bt_config_component *cfg_comp,
enum bt_config_component_dest dest)
{
- bt_get(cfg_comp);
+ bt_object_get_ref(cfg_comp);
switch (dest) {
case BT_CONFIG_COMPONENT_DEST_SOURCE:
int add_run_cfg_comp_check_name(struct bt_config *cfg,
struct bt_config_component *cfg_comp,
enum bt_config_component_dest dest,
- struct bt_value *instance_names)
+ struct bt_private_value *instance_names)
{
int ret = 0;
goto end;
}
- if (bt_value_map_has_key(instance_names, cfg_comp->instance_name->str)) {
+ if (bt_value_map_has_entry(bt_value_borrow_from_private(instance_names),
+ cfg_comp->instance_name->str)) {
printf_err("Duplicate component instance name:\n %s\n",
cfg_comp->instance_name->str);
ret = -1;
goto end;
}
- if (bt_value_map_insert(instance_names,
+ if (bt_private_value_map_insert_entry(instance_names,
cfg_comp->instance_name->str, bt_value_null)) {
print_err_oom();
ret = -1;
}
static
-int append_env_var_plugin_paths(struct bt_value *plugin_paths)
+int append_env_var_plugin_paths(struct bt_private_value *plugin_paths)
{
int ret = 0;
const char *envvar;
}
static
-int append_home_and_system_plugin_paths(struct bt_value *plugin_paths,
+int append_home_and_system_plugin_paths(struct bt_private_value *plugin_paths,
bool omit_system_plugin_path, bool omit_home_plugin_path)
{
int ret;
static
struct bt_config *bt_config_base_create(enum bt_config_command command,
- struct bt_value *initial_plugin_paths, bool needs_plugins)
+ struct bt_private_value *initial_plugin_paths,
+ bool needs_plugins)
{
struct bt_config *cfg;
cfg->command_needs_plugins = needs_plugins;
if (initial_plugin_paths) {
- cfg->plugin_paths = bt_get(initial_plugin_paths);
+ cfg->plugin_paths = bt_object_get_ref(initial_plugin_paths);
} else {
- cfg->plugin_paths = bt_value_array_create();
+ cfg->plugin_paths = bt_private_value_array_create();
if (!cfg->plugin_paths) {
print_err_oom();
goto error;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
struct bt_config *bt_config_run_create(
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg;
}
cfg->cmd_data.run.sources = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_put);
+ (GDestroyNotify) bt_object_put_ref);
if (!cfg->cmd_data.run.sources) {
print_err_oom();
goto error;
}
cfg->cmd_data.run.filters = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_put);
+ (GDestroyNotify) bt_object_put_ref);
if (!cfg->cmd_data.run.filters) {
print_err_oom();
goto error;
}
cfg->cmd_data.run.sinks = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_put);
+ (GDestroyNotify) bt_object_put_ref);
if (!cfg->cmd_data.run.sinks) {
print_err_oom();
goto error;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
struct bt_config *bt_config_list_plugins_create(
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
struct bt_config *bt_config_help_create(
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
struct bt_config *bt_config_query_create(
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
struct bt_config *bt_config_print_ctf_metadata_create(
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
struct bt_config *bt_config_print_lttng_live_sessions_create(
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg;
goto end;
error:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
return cfg;
static
int bt_config_append_plugin_paths_check_setuid_setgid(
- struct bt_value *plugin_paths, const char *arg)
+ struct bt_private_value *plugin_paths, const char *arg)
{
int ret = 0;
struct bt_config *bt_config_help_from_args(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
poptContext pc = NULL;
char *arg = NULL;
case OPT_HELP:
print_help_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
printf_err("Unknown command-line option specified (option code %d)\n",
} else {
print_help_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
}
error:
*retcode = 1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
g_free(plugin_name);
struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
poptContext pc = NULL;
char *arg = NULL;
int ret;
struct bt_config *cfg = NULL;
const char *leftover;
- struct bt_value *params = bt_value_null;
+ struct bt_private_value *params = bt_private_value_null;
*retcode = 0;
cfg = bt_config_query_create(initial_plugin_paths);
break;
case OPT_PARAMS:
{
- bt_put(params);
- params = bt_value_from_arg(arg);
+ bt_object_put_ref(params);
+ params = bt_private_value_from_arg(arg);
if (!params) {
printf_err("Invalid format for --params option's argument:\n %s\n",
arg);
case OPT_HELP:
print_query_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
printf_err("Unknown command-line option specified (option code %d)\n",
}
BT_ASSERT(params);
- BT_MOVE(cfg->cmd_data.query.cfg_component->params, params);
+ BT_OBJECT_MOVE_REF(cfg->cmd_data.query.cfg_component->params,
+ params);
} else {
print_query_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
}
} else {
print_query_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
}
error:
*retcode = 1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
if (pc) {
poptFreeContext(pc);
}
- bt_put(params);
+ bt_object_put_ref(params);
free(arg);
return cfg;
}
struct bt_config *bt_config_list_plugins_from_args(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
poptContext pc = NULL;
char *arg = NULL;
case OPT_HELP:
print_list_plugins_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
printf_err("Unknown command-line option specified (option code %d)\n",
error:
*retcode = 1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
if (pc) {
struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
poptContext pc = NULL;
char *arg = NULL;
struct bt_config_component *cur_cfg_comp = NULL;
enum bt_config_component_dest cur_cfg_comp_dest =
BT_CONFIG_COMPONENT_DEST_UNKNOWN;
- struct bt_value *cur_base_params = NULL;
+ struct bt_private_value *cur_base_params = NULL;
int opt, ret = 0;
struct bt_config *cfg = NULL;
- struct bt_value *instance_names = NULL;
- struct bt_value *connection_args = NULL;
+ struct bt_private_value *instance_names = NULL;
+ struct bt_private_value *connection_args = NULL;
GString *cur_param_key = NULL;
char error_buf[256] = { 0 };
long retry_duration = -1;
+ enum bt_value_status status;
struct poptOption run_long_options[] = {
{ "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL },
{ "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
cfg->cmd_data.run.retry_duration_us = 100000;
cfg->omit_system_plugin_path = force_omit_system_plugin_path;
cfg->omit_home_plugin_path = force_omit_home_plugin_path;
- cur_base_params = bt_value_map_create();
+ cur_base_params = bt_private_value_map_create();
if (!cur_base_params) {
print_err_oom();
goto error;
}
- instance_names = bt_value_map_create();
+ instance_names = bt_private_value_map_create();
if (!instance_names) {
print_err_oom();
goto error;
}
- connection_args = bt_value_array_create();
+ connection_args = bt_private_value_array_create();
if (!connection_args) {
print_err_oom();
goto error;
ret = add_run_cfg_comp_check_name(cfg,
cur_cfg_comp, cur_cfg_comp_dest,
instance_names);
- BT_PUT(cur_cfg_comp);
+ BT_OBJECT_PUT_REF_AND_RESET(cur_cfg_comp);
if (ret) {
goto error;
}
}
BT_ASSERT(cur_base_params);
- bt_put(cur_cfg_comp->params);
- cur_cfg_comp->params = bt_value_copy(cur_base_params);
- if (!cur_cfg_comp->params) {
+ bt_object_put_ref(cur_cfg_comp->params);
+ status = bt_value_copy(
+ &cur_cfg_comp->params,
+ bt_value_borrow_from_private(cur_base_params));
+ if (status != BT_VALUE_STATUS_OK) {
print_err_oom();
goto error;
}
}
case OPT_PARAMS:
{
- struct bt_value *params;
- struct bt_value *params_to_set;
+ struct bt_private_value *params;
+ struct bt_private_value *params_to_set;
if (!cur_cfg_comp) {
printf_err("Cannot add parameters to unavailable component:\n %s\n",
goto error;
}
- params = bt_value_from_arg(arg);
+ params = bt_private_value_from_arg(arg);
if (!params) {
printf_err("Invalid format for --params option's argument:\n %s\n",
arg);
goto error;
}
- params_to_set = bt_value_map_extend(cur_cfg_comp->params,
- params);
- BT_PUT(params);
- if (!params_to_set) {
+ status = bt_value_map_extend(¶ms_to_set,
+ bt_value_borrow_from_private(cur_cfg_comp->params),
+ bt_value_borrow_from_private(params));
+ BT_OBJECT_PUT_REF_AND_RESET(params);
+ if (status != BT_VALUE_STATUS_OK) {
printf_err("Cannot extend current component parameters with --params option's argument:\n %s\n",
arg);
goto error;
}
- BT_MOVE(cur_cfg_comp->params, params_to_set);
+ BT_OBJECT_MOVE_REF(cur_cfg_comp->params, params_to_set);
break;
}
case OPT_KEY:
goto error;
}
- if (bt_value_map_insert_string(cur_cfg_comp->params,
+ if (bt_private_value_map_insert_string_entry(cur_cfg_comp->params,
cur_param_key->str, arg)) {
print_err_oom();
goto error;
break;
case OPT_BASE_PARAMS:
{
- struct bt_value *params = bt_value_from_arg(arg);
+ struct bt_private_value *params =
+ bt_private_value_from_arg(arg);
if (!params) {
printf_err("Invalid format for --base-params option's argument:\n %s\n",
goto error;
}
- BT_MOVE(cur_base_params, params);
+ BT_OBJECT_MOVE_REF(cur_base_params, params);
break;
}
case OPT_RESET_BASE_PARAMS:
- BT_PUT(cur_base_params);
- cur_base_params = bt_value_map_create();
+ BT_OBJECT_PUT_REF_AND_RESET(cur_base_params);
+ cur_base_params = bt_private_value_map_create();
if (!cur_base_params) {
print_err_oom();
goto error;
}
break;
case OPT_CONNECT:
- if (bt_value_array_append_string(connection_args,
- arg)) {
+ if (bt_private_value_array_append_string_element(
+ connection_args, arg)) {
print_err_oom();
goto error;
}
case OPT_HELP:
print_run_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
printf_err("Unknown command-line option specified (option code %d)\n",
if (cur_cfg_comp) {
ret = add_run_cfg_comp_check_name(cfg, cur_cfg_comp,
cur_cfg_comp_dest, instance_names);
- BT_PUT(cur_cfg_comp);
+ BT_OBJECT_PUT_REF_AND_RESET(cur_cfg_comp);
if (ret) {
goto error;
}
goto error;
}
- ret = bt_config_cli_args_create_connections(cfg, connection_args,
+ ret = bt_config_cli_args_create_connections(cfg,
+ bt_value_borrow_from_private(connection_args),
error_buf, 256);
if (ret) {
printf_err("Cannot creation connections:\n%s", error_buf);
error:
*retcode = 1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
if (pc) {
}
free(arg);
- BT_PUT(cur_cfg_comp);
- BT_PUT(cur_base_params);
- BT_PUT(instance_names);
- BT_PUT(connection_args);
+ BT_OBJECT_PUT_REF_AND_RESET(cur_cfg_comp);
+ BT_OBJECT_PUT_REF_AND_RESET(cur_base_params);
+ BT_OBJECT_PUT_REF_AND_RESET(instance_names);
+ BT_OBJECT_PUT_REF_AND_RESET(connection_args);
return cfg;
}
struct bt_config *bt_config_run_from_args_array(struct bt_value *run_args,
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *cfg = NULL;
const char **argv;
int64_t i, len;
- const size_t argc = bt_value_array_size(run_args) + 1;
+ const size_t argc = bt_value_array_get_size(run_args) + 1;
argv = calloc(argc, sizeof(*argv));
if (!argv) {
argv[0] = "run";
- len = bt_value_array_size(run_args);
+ len = bt_value_array_get_size(run_args);
if (len < 0) {
printf_err("Invalid executable arguments\n");
goto end;
}
for (i = 0; i < len; i++) {
- int ret;
- struct bt_value *arg_value = bt_value_array_get(run_args, i);
+ struct bt_value *arg_value =
+ bt_value_array_borrow_element_by_index(run_args, i);
const char *arg;
BT_ASSERT(arg_value);
- ret = bt_value_string_get(arg_value, &arg);
- BT_ASSERT(ret == 0);
+ arg = bt_value_string_get(arg_value);
BT_ASSERT(arg);
argv[i + 1] = arg;
- bt_put(arg_value);
}
cfg = bt_config_run_from_args(argc, argv, retcode,
goto end;
}
- if (!bt_value_map_has_key(existing_names, prefix)) {
+ if (!bt_value_map_has_entry(existing_names, prefix)) {
g_string_assign(auto_name, prefix);
goto end;
}
do {
g_string_printf(auto_name, "%s-%d", prefix, i);
i++;
- } while (bt_value_map_has_key(existing_names, auto_name->str));
+ } while (bt_value_map_has_entry(existing_names, auto_name->str));
end:
return auto_name;
GString *comp_arg;
GString *name_arg;
GString *params_arg;
- struct bt_value *extra_params;
+ struct bt_private_value *extra_params;
};
static
int assign_name_to_implicit_component(struct implicit_component_args *args,
- const char *prefix, struct bt_value *existing_names,
+ const char *prefix, struct bt_private_value *existing_names,
GList **comp_names, bool append_to_comp_names)
{
int ret = 0;
goto end;
}
- name = get_component_auto_name(prefix, existing_names);
+ name = get_component_auto_name(prefix,
+ bt_value_borrow_from_private(existing_names));
if (!name) {
ret = -1;
g_string_assign(args->name_arg, name->str);
- if (bt_value_map_insert(existing_names, name->str,
+ if (bt_private_value_map_insert_entry(existing_names, name->str,
bt_value_null)) {
print_err_oom();
ret = -1;
static
int append_run_args_for_implicit_component(
struct implicit_component_args *impl_args,
- struct bt_value *run_args)
+ struct bt_private_value *run_args)
{
int ret = 0;
size_t i;
goto end;
}
- if (bt_value_array_append_string(run_args, "--component")) {
+ if (bt_private_value_array_append_string_element(run_args, "--component")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, impl_args->comp_arg->str)) {
+ if (bt_private_value_array_append_string_element(run_args, impl_args->comp_arg->str)) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, "--name")) {
+ if (bt_private_value_array_append_string_element(run_args, "--name")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, impl_args->name_arg->str)) {
+ if (bt_private_value_array_append_string_element(run_args, impl_args->name_arg->str)) {
print_err_oom();
goto error;
}
if (impl_args->params_arg->len > 0) {
- if (bt_value_array_append_string(run_args, "--params")) {
+ if (bt_private_value_array_append_string_element(run_args, "--params")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
impl_args->params_arg->str)) {
print_err_oom();
goto error;
}
}
- for (i = 0; i < bt_value_array_size(impl_args->extra_params); i++) {
+ for (i = 0; i < bt_value_array_get_size(
+ bt_value_borrow_from_private(impl_args->extra_params));
+ i++) {
struct bt_value *elem;
const char *arg;
- elem = bt_value_array_get(impl_args->extra_params, i);
+ elem = bt_value_array_borrow_element_by_index(
+ bt_value_borrow_from_private(impl_args->extra_params),
+ i);
if (!elem) {
goto error;
}
BT_ASSERT(bt_value_is_string(elem));
- if (bt_value_string_get(elem, &arg)) {
- goto error;
- }
-
- ret = bt_value_array_append_string(run_args, arg);
- bt_put(elem);
+ arg = bt_value_string_get(elem);
+ ret = bt_private_value_array_append_string_element(run_args, arg);
if (ret) {
print_err_oom();
goto error;
g_string_free(args->params_arg, TRUE);
}
- bt_put(args->extra_params);
+ bt_object_put_ref(args->extra_params);
}
static
args->comp_arg = g_string_new(comp_arg);
args->name_arg = g_string_new(NULL);
args->params_arg = g_string_new(NULL);
- args->extra_params = bt_value_array_create();
+ args->extra_params = bt_private_value_array_create();
if (!args->comp_arg || !args->name_arg ||
!args->params_arg || !args->extra_params) {
BT_ASSERT(key);
BT_ASSERT(value);
- if (bt_value_array_append_string(args->extra_params, "--key")) {
+ if (bt_private_value_array_append_string_element(args->extra_params, "--key")) {
print_err_oom();
ret = -1;
goto end;
}
- if (bt_value_array_append_string(args->extra_params, key)) {
+ if (bt_private_value_array_append_string_element(args->extra_params, key)) {
print_err_oom();
ret = -1;
goto end;
}
- if (bt_value_array_append_string(args->extra_params, "--value")) {
+ if (bt_private_value_array_append_string_element(args->extra_params, "--value")) {
print_err_oom();
ret = -1;
goto end;
}
- if (bt_value_array_append_string(args->extra_params, value)) {
+ if (bt_private_value_array_append_string_element(args->extra_params, value)) {
print_err_oom();
ret = -1;
goto end;
static
int convert_append_name_param(enum bt_config_component_dest dest,
GString *cur_name, GString *cur_name_prefix,
- struct bt_value *run_args, struct bt_value *all_names,
+ struct bt_private_value *run_args,
+ struct bt_private_value *all_names,
GList **source_names, GList **filter_names,
GList **sink_names)
{
* component.
*/
name = get_component_auto_name(cur_name_prefix->str,
- all_names);
+ bt_value_borrow_from_private(all_names));
append_name_opt = true;
} else {
/*
* An explicit name was provided for the user
* component.
*/
- if (bt_value_map_has_key(all_names,
+ if (bt_value_map_has_entry(
+ bt_value_borrow_from_private(all_names),
cur_name->str)) {
printf_err("Duplicate component instance name:\n %s\n",
cur_name->str);
* Remember this name globally, for the uniqueness of
* all component names.
*/
- if (bt_value_map_insert(all_names, name->str, bt_value_null)) {
+ if (bt_private_value_map_insert_entry(all_names, name->str, bt_value_null)) {
print_err_oom();
goto error;
}
* Append the --name option if necessary.
*/
if (append_name_opt) {
- if (bt_value_array_append_string(run_args, "--name")) {
+ if (bt_private_value_array_append_string_element(run_args, "--name")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, name->str)) {
+ if (bt_private_value_array_append_string_element(run_args, name->str)) {
print_err_oom();
goto error;
}
* function.
*/
static
-int append_connect_arg(struct bt_value *run_args,
+int append_connect_arg(struct bt_private_value *run_args,
const char *upstream_name, const char *downstream_name)
{
int ret = 0;
goto end;
}
- ret = bt_value_array_append_string(run_args, "--connect");
+ ret = bt_private_value_array_append_string_element(run_args, "--connect");
if (ret) {
print_err_oom();
ret = -1;
g_string_append(arg, e_upstream_name->str);
g_string_append_c(arg, ':');
g_string_append(arg, e_downstream_name->str);
- ret = bt_value_array_append_string(run_args, arg->str);
+ ret = bt_private_value_array_append_string_element(run_args, arg->str);
if (ret) {
print_err_oom();
ret = -1;
* Appends the run command's --connect options for the convert command.
*/
static
-int convert_auto_connect(struct bt_value *run_args,
+int convert_auto_connect(struct bt_private_value *run_args,
GList *source_names, GList *filter_names,
GList *sink_names)
{
{
int ret = 0;
GList *leftover;
+ enum bt_value_status status;
for (leftover = leftovers; leftover != NULL;
leftover = g_list_next(leftover)) {
* We need our own copy of the extra parameters because
* this is where the unique path goes.
*/
- BT_PUT(impl_args->extra_params);
- impl_args->extra_params =
- bt_value_copy(base_implicit_ctf_input_args->extra_params);
- if (!impl_args->extra_params) {
+ BT_OBJECT_PUT_REF_AND_RESET(impl_args->extra_params);
+ status = bt_value_copy(&impl_args->extra_params,
+ bt_value_borrow_from_private(
+ base_implicit_ctf_input_args->extra_params));
+ if (status != BT_VALUE_STATUS_OK) {
print_err_oom();
destroy_implicit_component_args(impl_args);
goto error;
struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths, char *log_level)
+ struct bt_private_value *initial_plugin_paths, char *log_level)
{
poptContext pc = NULL;
char *arg = NULL;
bool print_run_args = false;
bool print_run_args_0 = false;
bool print_ctf_metadata = false;
- struct bt_value *run_args = NULL;
- struct bt_value *all_names = NULL;
+ struct bt_private_value *run_args = NULL;
+ struct bt_private_value *all_names = NULL;
GList *source_names = NULL;
GList *filter_names = NULL;
GList *sink_names = NULL;
struct implicit_component_args implicit_debug_info_args = { 0 };
struct implicit_component_args implicit_muxer_args = { 0 };
struct implicit_component_args implicit_trimmer_args = { 0 };
- struct bt_value *plugin_paths = bt_get(initial_plugin_paths);
+ struct bt_private_value *plugin_paths =
+ bt_object_get_ref(initial_plugin_paths);
char error_buf[256] = { 0 };
size_t i;
struct bt_common_lttng_live_url_parts lttng_live_url_parts = { 0 };
goto error;
}
- all_names = bt_value_map_create();
+ all_names = bt_private_value_map_create();
if (!all_names) {
print_err_oom();
goto error;
}
- run_args = bt_value_array_create();
+ run_args = bt_private_value_array_create();
if (!run_args) {
print_err_oom();
goto error;
abort();
}
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
"--component")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
goto error;
}
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
"--params")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
goto error;
}
- if (bt_value_array_append_string(run_args, "--key")) {
+ if (bt_private_value_array_append_string_element(run_args, "--key")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, "path")) {
+ if (bt_private_value_array_append_string_element(run_args, "path")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, "--value")) {
+ if (bt_private_value_array_append_string_element(run_args, "--value")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
goto error;
}
- if (bt_value_array_append_string(run_args, "--key")) {
+ if (bt_private_value_array_append_string_element(run_args, "--key")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, "url")) {
+ if (bt_private_value_array_append_string_element(run_args, "url")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, "--value")) {
+ if (bt_private_value_array_append_string_element(run_args, "--value")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
goto error;
}
- if (bt_value_array_append_string(run_args, "--name")) {
+ if (bt_private_value_array_append_string_element(run_args, "--name")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
case OPT_OMIT_HOME_PLUGIN_PATH:
force_omit_home_plugin_path = true;
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
"--omit-home-plugin-path")) {
print_err_oom();
goto error;
}
break;
case OPT_RETRY_DURATION:
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
"--retry-duration")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
case OPT_OMIT_SYSTEM_PLUGIN_PATH:
force_omit_system_plugin_path = true;
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
"--omit-system-plugin-path")) {
print_err_oom();
goto error;
goto error;
}
- if (bt_value_array_append_string(run_args,
+ if (bt_private_value_array_append_string_element(run_args,
"--plugin-path")) {
print_err_oom();
goto error;
}
- if (bt_value_array_append_string(run_args, arg)) {
+ if (bt_private_value_array_append_string_element(run_args, arg)) {
print_err_oom();
goto error;
}
case OPT_HELP:
print_convert_usage(stdout);
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
case OPT_BEGIN:
case OPT_CLOCK_CYCLES:
break;
case OPT_FIELDS:
{
- struct bt_value *fields = fields_from_arg(arg);
+ struct bt_private_value *fields = fields_from_arg(arg);
if (!fields) {
goto error;
implicit_text_args.exists = true;
ret = insert_flat_params_from_array(
implicit_text_args.params_arg,
- fields, "field");
- bt_put(fields);
+ bt_value_borrow_from_private(fields), "field");
+ bt_object_put_ref(fields);
if (ret) {
goto error;
}
}
case OPT_NAMES:
{
- struct bt_value *names = names_from_arg(arg);
+ struct bt_private_value *names = names_from_arg(arg);
if (!names) {
goto error;
implicit_text_args.exists = true;
ret = insert_flat_params_from_array(
implicit_text_args.params_arg,
- names, "name");
- bt_put(names);
+ bt_value_borrow_from_private(names), "name");
+ bt_object_put_ref(names);
if (ret) {
goto error;
}
goto error;
}
- for (i = 0; i < bt_value_array_size(run_args); i++) {
+ for (i = 0; i < bt_value_array_get_size(
+ bt_value_borrow_from_private(run_args)); i++) {
struct bt_value *arg_value =
- bt_value_array_get(run_args, i);
+ bt_value_array_borrow_element_by_index(
+ bt_value_borrow_from_private(run_args),
+ i);
const char *arg;
GString *quoted = NULL;
const char *arg_to_print;
BT_ASSERT(arg_value);
- ret = bt_value_string_get(arg_value, &arg);
- BT_ASSERT(ret == 0);
- BT_PUT(arg_value);
+ arg = bt_value_string_get(arg_value);
if (print_run_args) {
quoted = bt_common_shell_quote(arg, true);
g_string_free(quoted, TRUE);
}
- if (i < bt_value_array_size(run_args) - 1) {
+ if (i < bt_value_array_get_size(
+ bt_value_borrow_from_private(run_args)) - 1) {
if (print_run_args) {
putchar(' ');
} else {
}
*retcode = -1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
}
- cfg = bt_config_run_from_args_array(run_args, retcode,
+ cfg = bt_config_run_from_args_array(
+ bt_value_borrow_from_private(run_args), retcode,
force_omit_system_plugin_path, force_omit_home_plugin_path,
initial_plugin_paths);
if (!cfg) {
error:
*retcode = 1;
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
end:
if (pc) {
g_ptr_array_free(implicit_ctf_inputs_args, TRUE);
}
- bt_put(run_args);
- bt_put(all_names);
+ bt_object_put_ref(run_args);
+ bt_object_put_ref(all_names);
destroy_glist_of_gstring(source_names);
destroy_glist_of_gstring(filter_names);
destroy_glist_of_gstring(sink_names);
finalize_implicit_component_args(&implicit_debug_info_args);
finalize_implicit_component_args(&implicit_muxer_args);
finalize_implicit_component_args(&implicit_trimmer_args);
- bt_put(plugin_paths);
+ bt_object_put_ref(plugin_paths);
bt_common_destroy_lttng_live_url_parts(<tng_live_url_parts);
return cfg;
}
struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- struct bt_value *initial_plugin_paths)
+ struct bt_private_value *initial_plugin_paths)
{
struct bt_config *config = NULL;
int i;
*retcode = -1;
if (!initial_plugin_paths) {
- initial_plugin_paths = bt_value_array_create();
+ initial_plugin_paths = bt_private_value_array_create();
if (!initial_plugin_paths) {
*retcode = 1;
goto end;
}
} else {
- bt_get(initial_plugin_paths);
+ bt_object_get_ref(initial_plugin_paths);
}
if (argc <= 1) {
}
end:
- bt_put(initial_plugin_paths);
+ bt_object_put_ref(initial_plugin_paths);
return config;
}
projects / babeltrace.git / blobdiff