X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=cli%2Fbabeltrace-cfg-cli-args.c;h=80802fbedf022b6a04d009e2bae2048ec965fa92;hb=707b7d3548cc010d582f7faed43630aed26508fd;hp=3af66edf2274a76e0fe66a053f43a90d21e91491;hpb=7845e95f389ea93625ddbfb98c94ae794b533e1f;p=babeltrace.git diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c index 3af66edf..80802fbe 100644 --- a/cli/babeltrace-cfg-cli-args.c +++ b/cli/babeltrace-cfg-cli-args.c @@ -28,13 +28,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -84,7 +85,7 @@ struct ini_parsing_state { 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; @@ -241,7 +242,9 @@ int ini_handle_state(struct ini_parsing_state *state) goto error; } - if (bt_value_map_has_key(state->params, state->last_map_key)) { + if (bt_value_map_has_entry( + bt_private_value_as_value(state->params), + state->last_map_key)) { g_string_append_printf(state->ini_error, "Duplicate parameter key: `%s`\n", state->last_map_key); @@ -292,19 +295,22 @@ int ini_handle_state(struct ini_parsing_state *state) goto error; } - value = bt_value_integer_create_init( - (int64_t) int_val); + value = bt_private_value_as_value( + 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_private_value_as_value( + 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_private_value_as_value( + bt_private_value_string_create_init( + state->scanner->value.v_string)); break; case G_TOKEN_IDENTIFIER: { @@ -326,14 +332,17 @@ int ini_handle_state(struct ini_parsing_state *state) } else if (!strcmp(id, "true") || !strcmp(id, "TRUE") || !strcmp(id, "yes") || !strcmp(id, "YES")) { - value = bt_value_bool_create_init(true); + value = bt_private_value_as_value( + 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_private_value_as_value( + bt_private_value_bool_create_init(false)); } else { - value = bt_value_string_create_init(id); + value = bt_private_value_as_value( + bt_private_value_string_create_init(id)); } break; } @@ -366,14 +375,16 @@ int ini_handle_state(struct ini_parsing_state *state) goto error; } - value = bt_value_integer_create_init( - -((int64_t) int_val)); + value = bt_private_value_as_value( + 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_private_value_as_value( + bt_private_value_real_create_init( + -state->scanner->value.v_float)); break; default: /* Unset value variable will trigger the error */ @@ -414,7 +425,7 @@ 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; @@ -422,7 +433,7 @@ success: } end: - BT_PUT(value); + BT_OBJECT_PUT_REF_AND_RESET(value); return ret; } @@ -432,7 +443,8 @@ end: * 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 = { @@ -511,7 +523,7 @@ struct bt_value *bt_value_from_ini(const char *arg, GString *ini_error) .ini_error = ini_error, }; - state.params = bt_value_map_create(); + state.params = bt_private_value_map_create(); if (!state.params) { goto error; } @@ -539,7 +551,7 @@ struct bt_value *bt_value_from_ini(const char *arg, GString *ini_error) goto end; error: - BT_PUT(state.params); + BT_OBJECT_PUT_REF_AND_RESET(state.params); end: if (state.scanner) { @@ -557,9 +569,9 @@ end: * 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); @@ -569,7 +581,7 @@ struct bt_value *bt_value_from_arg(const char *arg) } /* 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; @@ -579,6 +591,7 @@ end: if (ini_error) { g_string_free(ini_error, TRUE); } + return params; } @@ -608,10 +621,10 @@ void plugin_comp_cls_names(const char *arg, char **name, char **plugin, GString *gs_comp_cls = NULL; size_t end_pos; - assert(arg); - assert(plugin); - assert(comp_cls); - assert(comp_cls_type); + BT_ASSERT(arg); + BT_ASSERT(plugin); + BT_ASSERT(comp_cls); + BT_ASSERT(comp_cls_type); if (!bt_common_string_is_printable(arg)) { printf_err("Argument contains a non-printable character\n"); @@ -762,7 +775,7 @@ void bt_config_component_destroy(struct bt_object *obj) 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: @@ -789,7 +802,8 @@ struct bt_config_component *bt_config_component_create( goto error; } - bt_object_init(cfg_component, bt_config_component_destroy); + bt_object_init_shared(&cfg_component->base, + bt_config_component_destroy); cfg_component->type = type; cfg_component->plugin_name = g_string_new(plugin_name); if (!cfg_component->plugin_name) { @@ -810,7 +824,7 @@ struct bt_config_component *bt_config_component_create( } /* 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; @@ -819,7 +833,7 @@ struct bt_config_component *bt_config_component_create( goto end; error: - BT_PUT(cfg_component); + BT_OBJECT_PUT_REF_AND_RESET(cfg_component); end: return cfg_component; @@ -855,7 +869,7 @@ struct bt_config_component *bt_config_component_from_arg(const char *arg) goto end; error: - BT_PUT(cfg_comp); + BT_OBJECT_PUT_REF_AND_RESET(cfg_comp); end: g_free(name); @@ -877,7 +891,7 @@ void bt_config_destroy(struct bt_object *obj) goto end; } - BT_PUT(cfg->plugin_paths); + BT_OBJECT_PUT_REF_AND_RESET(cfg->plugin_paths); switch (cfg->command) { case BT_CONFIG_COMMAND_RUN: @@ -901,10 +915,10 @@ void bt_config_destroy(struct bt_object *obj) 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); @@ -1009,13 +1023,13 @@ GScanner *create_csv_identifiers_scanner(void) * 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; @@ -1040,33 +1054,33 @@ struct bt_value *names_from_arg(const char *arg) !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; } @@ -1096,7 +1110,7 @@ end: * 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; } } @@ -1106,7 +1120,7 @@ end: return names; error: - BT_PUT(names); + BT_OBJECT_PUT_REF_AND_RESET(names); if (scanner) { g_scanner_destroy(scanner); } @@ -1121,12 +1135,12 @@ error: * 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; @@ -1156,7 +1170,7 @@ struct bt_value *fields_from_arg(const char *arg) !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; } @@ -1179,7 +1193,7 @@ struct bt_value *fields_from_arg(const char *arg) goto end; error: - BT_PUT(fields); + BT_OBJECT_PUT_REF_AND_RESET(fields); end: if (scanner) { @@ -1191,9 +1205,9 @@ end: static void append_param_arg(GString *params_arg, const char *key, const char *value) { - assert(params_arg); - assert(key); - assert(value); + BT_ASSERT(params_arg); + BT_ASSERT(key); + BT_ASSERT(value); if (params_arg->len != 0) { g_string_append_c(params_arg, ','); @@ -1239,8 +1253,9 @@ int insert_flat_params_from_array(GString *params_arg, 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; @@ -1250,12 +1265,7 @@ int insert_flat_params_from_array(GString *params_arg, 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, "-"); @@ -1363,7 +1373,7 @@ void add_run_cfg_comp(struct bt_config *cfg, 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: @@ -1384,7 +1394,7 @@ static 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; @@ -1394,14 +1404,15 @@ int add_run_cfg_comp_check_name(struct bt_config *cfg, goto end; } - if (bt_value_map_has_key(instance_names, cfg_comp->instance_name->str)) { + if (bt_value_map_has_entry(bt_private_value_as_value(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; @@ -1415,7 +1426,7 @@ end: } 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; @@ -1441,7 +1452,7 @@ end: } 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; @@ -1488,7 +1499,8 @@ int append_home_and_system_plugin_paths_cfg(struct bt_config *cfg) 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; @@ -1499,14 +1511,14 @@ struct bt_config *bt_config_base_create(enum bt_config_command command, goto error; } - bt_object_init(cfg, bt_config_destroy); + bt_object_init_shared(&cfg->base, bt_config_destroy); cfg->command = command; 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; @@ -1516,7 +1528,7 @@ struct bt_config *bt_config_base_create(enum bt_config_command command, goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1524,7 +1536,7 @@ end: 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; @@ -1536,21 +1548,21 @@ struct bt_config *bt_config_run_create( } 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; @@ -1566,7 +1578,7 @@ struct bt_config *bt_config_run_create( goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1574,7 +1586,7 @@ end: 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; @@ -1588,7 +1600,7 @@ struct bt_config *bt_config_list_plugins_create( goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1596,7 +1608,7 @@ end: 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; @@ -1608,8 +1620,7 @@ struct bt_config *bt_config_help_create( } cfg->cmd_data.help.cfg_component = - bt_config_component_create(BT_COMPONENT_CLASS_TYPE_UNKNOWN, - NULL, NULL); + bt_config_component_create(-1, NULL, NULL); if (!cfg->cmd_data.help.cfg_component) { goto error; } @@ -1617,7 +1628,7 @@ struct bt_config *bt_config_help_create( goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1625,7 +1636,7 @@ end: 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; @@ -1645,7 +1656,7 @@ struct bt_config *bt_config_query_create( goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1653,7 +1664,7 @@ end: 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; @@ -1679,7 +1690,7 @@ struct bt_config *bt_config_print_ctf_metadata_create( goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1687,7 +1698,7 @@ end: 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; @@ -1714,7 +1725,7 @@ struct bt_config *bt_config_print_lttng_live_sessions_create( goto end; error: - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: return cfg; @@ -1722,7 +1733,7 @@ end: 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; @@ -1823,7 +1834,7 @@ static 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; @@ -1875,7 +1886,7 @@ struct bt_config *bt_config_help_from_args(int argc, const char *argv[], 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", @@ -1909,8 +1920,6 @@ struct bt_config *bt_config_help_from_args(int argc, const char *argv[], comp_cls_name); } else { /* Fall back to plugin help */ - cfg->cmd_data.help.cfg_component->type = - BT_COMPONENT_CLASS_TYPE_UNKNOWN; g_string_assign( cfg->cmd_data.help.cfg_component->plugin_name, leftover); @@ -1918,7 +1927,7 @@ struct bt_config *bt_config_help_from_args(int argc, const char *argv[], } else { print_help_usage(stdout); *retcode = -1; - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); goto end; } @@ -1930,7 +1939,7 @@ struct bt_config *bt_config_help_from_args(int argc, const char *argv[], error: *retcode = 1; - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: g_free(plugin_name); @@ -1987,7 +1996,7 @@ static 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; @@ -1995,7 +2004,7 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[], 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); @@ -2038,8 +2047,8 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[], 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); @@ -2050,7 +2059,7 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[], 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", @@ -2083,12 +2092,13 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[], goto error; } - assert(params); - BT_MOVE(cfg->cmd_data.query.cfg_component->params, params); + BT_ASSERT(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; } @@ -2103,7 +2113,7 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[], } else { print_query_usage(stdout); *retcode = -1; - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); goto end; } @@ -2121,14 +2131,14 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[], 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; } @@ -2175,7 +2185,7 @@ static 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; @@ -2226,7 +2236,7 @@ struct bt_config *bt_config_list_plugins_from_args(int argc, const char *argv[], 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", @@ -2259,7 +2269,7 @@ struct bt_config *bt_config_list_plugins_from_args(int argc, const char *argv[], error: *retcode = 1; - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: if (pc) { @@ -2365,21 +2375,22 @@ static 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 }, @@ -2418,19 +2429,19 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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; @@ -2475,7 +2486,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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; } @@ -2502,10 +2513,12 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], abort(); } - 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_ASSERT(cur_base_params); + bt_object_put_ref(cur_cfg_comp->params); + status = bt_value_copy( + &cur_cfg_comp->params, + bt_private_value_as_value(cur_base_params)); + if (status != BT_VALUE_STATUS_OK) { print_err_oom(); goto error; } @@ -2515,8 +2528,8 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], } 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", @@ -2524,23 +2537,24 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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_private_value_as_value(cur_cfg_comp->params), + bt_private_value_as_value(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: @@ -2564,7 +2578,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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; @@ -2581,7 +2595,8 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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", @@ -2589,20 +2604,20 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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; } @@ -2620,7 +2635,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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", @@ -2649,7 +2664,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], 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; } @@ -2669,7 +2684,8 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], goto error; } - ret = bt_config_cli_args_create_connections(cfg, connection_args, + ret = bt_config_cli_args_create_connections(cfg, + bt_private_value_as_value(connection_args), error_buf, 256); if (ret) { printf_err("Cannot creation connections:\n%s", error_buf); @@ -2680,7 +2696,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], error: *retcode = 1; - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: if (pc) { @@ -2692,10 +2708,10 @@ end: } 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; } @@ -2703,12 +2719,12 @@ static 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) { @@ -2718,22 +2734,20 @@ struct bt_config *bt_config_run_from_args_array(struct bt_value *run_args, 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; - assert(arg_value); - ret = bt_value_string_get(arg_value, &arg); - assert(ret == 0); - assert(arg); + BT_ASSERT(arg_value); + 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, @@ -2935,7 +2949,7 @@ GString *get_component_auto_name(const char *prefix, 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; } @@ -2943,7 +2957,7 @@ GString *get_component_auto_name(const char *prefix, 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; @@ -2954,12 +2968,12 @@ struct implicit_component_args { 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; @@ -2969,7 +2983,8 @@ int assign_name_to_implicit_component(struct implicit_component_args *args, goto end; } - name = get_component_auto_name(prefix, existing_names); + name = get_component_auto_name(prefix, + bt_private_value_as_value(existing_names)); if (!name) { ret = -1; @@ -2978,7 +2993,7 @@ int assign_name_to_implicit_component(struct implicit_component_args *args, 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; @@ -3001,7 +3016,7 @@ end: 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; @@ -3010,55 +3025,55 @@ int append_run_args_for_implicit_component( 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_private_value_as_value(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_private_value_as_value(impl_args->extra_params), + i); if (!elem) { goto error; } - 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); + BT_ASSERT(bt_value_is_string(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; @@ -3077,7 +3092,7 @@ end: static void finalize_implicit_component_args(struct implicit_component_args *args) { - assert(args); + BT_ASSERT(args); if (args->comp_arg) { g_string_free(args->comp_arg, TRUE); @@ -3091,7 +3106,7 @@ void finalize_implicit_component_args(struct implicit_component_args *args) g_string_free(args->params_arg, TRUE); } - bt_put(args->extra_params); + bt_object_put_ref(args->extra_params); } static @@ -3115,7 +3130,7 @@ int init_implicit_component_args(struct implicit_component_args *args, 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) { @@ -3133,9 +3148,9 @@ static void append_implicit_component_param(struct implicit_component_args *args, const char *key, const char *value) { - assert(args); - assert(key); - assert(value); + BT_ASSERT(args); + BT_ASSERT(key); + BT_ASSERT(value); append_param_arg(args->params_arg, key, value); } @@ -3145,29 +3160,29 @@ int append_implicit_component_extra_param(struct implicit_component_args *args, { int ret = 0; - assert(args); - assert(key); - assert(value); + BT_ASSERT(args); + 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; @@ -3180,7 +3195,8 @@ 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) { @@ -3197,14 +3213,15 @@ int convert_append_name_param(enum bt_config_component_dest dest, * component. */ name = get_component_auto_name(cur_name_prefix->str, - all_names); + bt_private_value_as_value(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_private_value_as_value(all_names), cur_name->str)) { printf_err("Duplicate component instance name:\n %s\n", cur_name->str); @@ -3223,7 +3240,7 @@ int convert_append_name_param(enum bt_config_component_dest dest, * 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; } @@ -3232,12 +3249,12 @@ int convert_append_name_param(enum bt_config_component_dest dest, * 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; } @@ -3305,7 +3322,7 @@ end: * 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; @@ -3319,7 +3336,7 @@ int append_connect_arg(struct bt_value *run_args, 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; @@ -3329,7 +3346,7 @@ int append_connect_arg(struct bt_value *run_args, 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; @@ -3356,7 +3373,7 @@ end: * 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) { @@ -3366,9 +3383,9 @@ int convert_auto_connect(struct bt_value *run_args, GList *filter_prev; GList *sink_at = sink_names; - assert(source_names); - assert(filter_names); - assert(sink_names); + BT_ASSERT(source_names); + BT_ASSERT(filter_names); + BT_ASSERT(sink_names); /* Connect all sources to the first filter */ for (source_at = source_names; source_at != NULL; source_at = g_list_next(source_at)) { @@ -3427,7 +3444,7 @@ int split_timerange(const char *arg, char **begin, char **end) GString *g_begin = NULL; GString *g_end = NULL; - assert(arg); + BT_ASSERT(arg); if (*ch == '[') { ch++; @@ -3445,8 +3462,8 @@ int split_timerange(const char *arg, char **begin, char **end) goto error; } - assert(begin); - assert(end); + BT_ASSERT(begin); + BT_ASSERT(end); *begin = g_begin->str; *end = g_end->str; g_string_free(g_begin, FALSE); @@ -3476,7 +3493,7 @@ int g_list_prepend_gstring(GList **list, const char *string) int ret = 0; GString *gs = g_string_new(string); - assert(list); + BT_ASSERT(list); if (!gs) { print_err_oom(); @@ -3516,6 +3533,7 @@ int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args, { int ret = 0; GList *leftover; + enum bt_value_status status; for (leftover = leftovers; leftover != NULL; leftover = g_list_next(leftover)) { @@ -3538,10 +3556,11 @@ int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args, * 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_private_value_as_value( + base_implicit_ctf_input_args->extra_params)); + if (status != BT_VALUE_STATUS_OK) { print_err_oom(); destroy_implicit_component_args(impl_args); goto error; @@ -3577,7 +3596,7 @@ static 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; @@ -3596,8 +3615,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; @@ -3611,7 +3630,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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 }; @@ -3672,13 +3692,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; @@ -3775,13 +3795,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3804,13 +3824,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3822,22 +3842,22 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3849,22 +3869,22 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3876,12 +3896,12 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3891,20 +3911,20 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3912,7 +3932,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; @@ -3924,13 +3944,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; } @@ -3938,7 +3958,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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: @@ -4149,7 +4169,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], 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; @@ -4158,8 +4178,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], implicit_text_args.exists = true; ret = insert_flat_params_from_array( implicit_text_args.params_arg, - fields, "field"); - bt_put(fields); + bt_private_value_as_value(fields), "field"); + bt_object_put_ref(fields); if (ret) { goto error; } @@ -4167,7 +4187,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], } case OPT_NAMES: { - struct bt_value *names = names_from_arg(arg); + struct bt_private_value *names = names_from_arg(arg); if (!names) { goto error; @@ -4176,8 +4196,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], implicit_text_args.exists = true; ret = insert_flat_params_from_array( implicit_text_args.params_arg, - names, "name"); - bt_put(names); + bt_private_value_as_value(names), "name"); + bt_object_put_ref(names); if (ret) { goto error; } @@ -4666,17 +4686,18 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], goto error; } - for (i = 0; i < bt_value_array_size(run_args); i++) { + for (i = 0; i < bt_value_array_get_size( + bt_private_value_as_value(run_args)); i++) { struct bt_value *arg_value = - bt_value_array_get(run_args, i); + bt_value_array_borrow_element_by_index( + bt_private_value_as_value(run_args), + i); const char *arg; GString *quoted = NULL; const char *arg_to_print; - assert(arg_value); - ret = bt_value_string_get(arg_value, &arg); - assert(ret == 0); - BT_PUT(arg_value); + BT_ASSERT(arg_value); + arg = bt_value_string_get(arg_value); if (print_run_args) { quoted = bt_common_shell_quote(arg, true); @@ -4695,7 +4716,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], g_string_free(quoted, TRUE); } - if (i < bt_value_array_size(run_args) - 1) { + if (i < bt_value_array_get_size( + bt_private_value_as_value(run_args)) - 1) { if (print_run_args) { putchar(' '); } else { @@ -4705,11 +4727,12 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], } *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_private_value_as_value(run_args), retcode, force_omit_system_plugin_path, force_omit_home_plugin_path, initial_plugin_paths); if (!cfg) { @@ -4721,7 +4744,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], error: *retcode = 1; - BT_PUT(cfg); + BT_OBJECT_PUT_REF_AND_RESET(cfg); end: if (pc) { @@ -4743,8 +4766,8 @@ end: 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); @@ -4757,7 +4780,7 @@ end: 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; } @@ -4774,7 +4797,7 @@ void print_gen_usage(FILE *fp) fprintf(fp, "\n"); fprintf(fp, " -d, --debug Enable debug mode (same as --log-level=V)\n"); fprintf(fp, " -h, --help Show this help and quit\n"); - fprintf(fp, " --log-level=LVL Set all log levels to LVL (`N`, `V`, `D`,\n"); + fprintf(fp, " -l, --log-level=LVL Set all log levels to LVL (`N`, `V`, `D`,\n"); fprintf(fp, " `I`, `W` (default), `E`, or `F`)\n"); fprintf(fp, " -v, --verbose Enable verbose mode (same as --log-level=I)\n"); fprintf(fp, " -V, --version Show version and quit\n"); @@ -4825,7 +4848,7 @@ char log_level_from_arg(const char *arg) 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; @@ -4846,13 +4869,13 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], *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) { @@ -4881,7 +4904,8 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], */ log_level = 'I'; } - } else if (strcmp(cur_arg, "--log-level") == 0) { + } else if (strcmp(cur_arg, "--log-level") == 0 || + strcmp(cur_arg, "-l") == 0) { if (!next_arg) { printf_err("Missing log level value for --log-level option\n"); *retcode = 1; @@ -4900,6 +4924,16 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], } else if (strncmp(cur_arg, "--log-level=", 12) == 0) { const char *arg = &cur_arg[12]; + log_level = log_level_from_arg(arg); + if (log_level == 'U') { + printf_err("Invalid argument for --log-level option:\n %s\n", + arg); + *retcode = 1; + goto end; + } + } else if (strncmp(cur_arg, "-l", 2) == 0) { + const char *arg = &cur_arg[2]; + log_level = log_level_from_arg(arg); if (log_level == 'U') { printf_err("Invalid argument for --log-level option:\n %s\n", @@ -4959,8 +4993,8 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], goto end; } - assert(command_argv); - assert(command_argc >= 0); + BT_ASSERT(command_argv); + BT_ASSERT(command_argc >= 0); switch (command_type) { case COMMAND_TYPE_RUN: @@ -5003,6 +5037,6 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], } end: - bt_put(initial_plugin_paths); + bt_object_put_ref(initial_plugin_paths); return config; }