/* Expect a value */
INI_EXPECT_VALUE,
- /* Expect a negative number value */
- INI_EXPECT_VALUE_NUMBER_NEG,
-
/* Expect a comma character (',') */
INI_EXPECT_COMMA,
};
GScanner *scanner;
/* Output map value object being filled (owned by this) */
- struct bt_value *params;
+ bt_value *params;
/* Next expected FSM state */
enum ini_parsing_fsm_state expecting;
GString *output;
GString *dbg_info_dir;
GString *dbg_info_target_prefix;
- const struct bt_value *names;
- const struct bt_value *fields;
+ const bt_value *names;
+ const bt_value *fields;
/* Flags */
bool no_delta;
g_string_append_printf(state->ini_error, "^\n\n");
}
+/* Parse the next token as a number and return its negation. */
+static
+bt_value *ini_parse_neg_number(struct ini_parsing_state *state)
+{
+ bt_value *value = NULL;
+ GTokenType token_type = g_scanner_get_next_token(state->scanner);
+
+ switch (token_type) {
+ case G_TOKEN_INT:
+ {
+ /* Negative integer */
+ uint64_t int_val = state->scanner->value.v_int64;
+
+ if (int_val > (1ULL << 63) - 1) {
+ g_string_append_printf(state->ini_error,
+ "Integer value -%" PRIu64 " is outside the range of a 64-bit signed integer\n",
+ int_val);
+ } else {
+ value = bt_value_integer_create_init(-((int64_t) int_val));
+ }
+
+ break;
+ }
+ case G_TOKEN_FLOAT:
+ /* Negative floating point number */
+ value = bt_value_real_create_init(-state->scanner->value.v_float);
+ break;
+ default:
+ ini_append_error_expecting(state, state->scanner, "value");
+ break;
+ }
+
+ return value;
+}
+
+/*
+ * Parse the current token (and the following ones if needed) as a value, return
+ * it as a bt_value.
+ */
+static
+bt_value *ini_parse_value(struct ini_parsing_state *state)
+{
+ bt_value *value = NULL;
+ GTokenType token_type = state->scanner->token;
+
+ switch (token_type) {
+ case G_TOKEN_CHAR:
+ if (state->scanner->value.v_char == '-') {
+ /* Negative number */
+ value = ini_parse_neg_number(state);
+ } else {
+ ini_append_error_expecting(state, state->scanner, "value");
+ }
+ break;
+ case G_TOKEN_INT:
+ {
+ /* Positive integer */
+ uint64_t int_val = state->scanner->value.v_int64;
+
+ if (int_val > (1ULL << 63) - 1) {
+ g_string_append_printf(state->ini_error,
+ "Integer value %" PRIu64 " is outside the range of a 64-bit signed integer\n",
+ int_val);
+ } else {
+ value = bt_value_integer_create_init((int64_t)int_val);
+ }
+ break;
+ }
+ case G_TOKEN_FLOAT:
+ /* Positive floating point number */
+ value = bt_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);
+ break;
+ case G_TOKEN_IDENTIFIER:
+ {
+ /*
+ * Using symbols would be appropriate here,
+ * but said symbols are allowed as map key,
+ * so it's easier to consider everything an
+ * identifier.
+ *
+ * If one of the known symbols is not
+ * recognized here, then fall back to creating
+ * a string value.
+ */
+ const char *id = state->scanner->value.v_identifier;
+
+ if (!strcmp(id, "null") || !strcmp(id, "NULL") ||
+ !strcmp(id, "nul")) {
+ value = bt_value_null;
+ } else if (!strcmp(id, "true") || !strcmp(id, "TRUE") ||
+ !strcmp(id, "yes") ||
+ !strcmp(id, "YES")) {
+ value = bt_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);
+ } else {
+ value = bt_value_string_create_init(id);
+ }
+ break;
+ }
+ default:
+ /* Unset value variable will trigger the error */
+ ini_append_error_expecting(state, state->scanner, "value");
+ break;
+ }
+
+ return value;
+}
+
static
int ini_handle_state(struct ini_parsing_state *state)
{
int ret = 0;
GTokenType token_type;
- struct bt_value *value = NULL;
+ bt_value *value = NULL;
token_type = g_scanner_get_next_token(state->scanner);
if (token_type == G_TOKEN_EOF) {
state->scanner, "'='");
break;
case INI_EXPECT_VALUE:
- case INI_EXPECT_VALUE_NUMBER_NEG:
ini_append_error_expecting(state,
state->scanner, "value");
break;
goto success;
case INI_EXPECT_VALUE:
{
- switch (token_type) {
- case G_TOKEN_CHAR:
- if (state->scanner->value.v_char == '-') {
- /* Negative number */
- state->expecting =
- INI_EXPECT_VALUE_NUMBER_NEG;
- goto success;
- } else {
- ini_append_error_expecting(state,
- state->scanner, "value");
- goto error;
- }
- break;
- case G_TOKEN_INT:
- {
- /* Positive integer */
- uint64_t int_val = state->scanner->value.v_int64;
-
- if (int_val > (1ULL << 63) - 1) {
- g_string_append_printf(state->ini_error,
- "Integer value %" PRIu64 " is outside the range of a 64-bit signed integer\n",
- int_val);
- goto error;
- }
-
- value = bt_value_integer_create_init((int64_t)int_val);
- break;
- }
- case G_TOKEN_FLOAT:
- /* Positive floating point number */
- value = bt_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);
- break;
- case G_TOKEN_IDENTIFIER:
- {
- /*
- * Using symbols would be appropriate here,
- * but said symbols are allowed as map key,
- * so it's easier to consider everything an
- * identifier.
- *
- * If one of the known symbols is not
- * recognized here, then fall back to creating
- * a string value.
- */
- const char *id = state->scanner->value.v_identifier;
-
- if (!strcmp(id, "null") || !strcmp(id, "NULL") ||
- !strcmp(id, "nul")) {
- value = bt_value_null;
- } else if (!strcmp(id, "true") || !strcmp(id, "TRUE") ||
- !strcmp(id, "yes") ||
- !strcmp(id, "YES")) {
- value = bt_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);
- } else {
- value = bt_value_string_create_init(id);
- }
- break;
- }
- default:
- /* Unset value variable will trigger the error */
- break;
- }
-
+ value = ini_parse_value(state);
if (!value) {
- ini_append_error_expecting(state,
- state->scanner, "value");
- goto error;
- }
-
- state->expecting = INI_EXPECT_COMMA;
- goto success;
- }
- case INI_EXPECT_VALUE_NUMBER_NEG:
- {
- switch (token_type) {
- case G_TOKEN_INT:
- {
- /* Negative integer */
- uint64_t int_val = state->scanner->value.v_int64;
-
- if (int_val > (1ULL << 63) - 1) {
- g_string_append_printf(state->ini_error,
- "Integer value -%" PRIu64 " is outside the range of a 64-bit signed integer\n",
- int_val);
- goto error;
- }
-
- value = bt_value_integer_create_init(-((int64_t)int_val));
- break;
- }
- case G_TOKEN_FLOAT:
- /* Negative floating point number */
- value = bt_value_real_create_init(-state->scanner->value.v_float);
- break;
- default:
- /* Unset value variable will trigger the error */
- break;
- }
-
- if (!value) {
- ini_append_error_expecting(state,
- state->scanner, "value");
goto error;
}
}
end:
- BT_OBJECT_PUT_REF_AND_RESET(value);
+ BT_VALUE_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,
+bt_value *bt_value_from_ini(const char *arg,
GString *ini_error)
{
/* Lexical scanner configuration */
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(state.params);
+ BT_VALUE_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)
+bt_value *bt_value_from_arg(const char *arg)
{
- struct bt_value *params = NULL;
+ bt_value *params = NULL;
GString *ini_error = NULL;
ini_error = g_string_new(NULL);
*/
static
void plugin_comp_cls_names(const char *arg, char **name, char **plugin,
- char **comp_cls, enum bt_component_class_type *comp_cls_type)
+ char **comp_cls, bt_component_class_type *comp_cls_type)
{
const char *at = arg;
GString *gs_name = NULL;
* Destroys a component configuration.
*/
static
-void bt_config_component_destroy(struct bt_object *obj)
+void bt_config_component_destroy(bt_object *obj)
{
struct bt_config_component *bt_config_component =
container_of(obj, struct bt_config_component, base);
g_string_free(bt_config_component->instance_name, TRUE);
}
- BT_OBJECT_PUT_REF_AND_RESET(bt_config_component->params);
+ BT_VALUE_PUT_REF_AND_RESET(bt_config_component->params);
g_free(bt_config_component);
end:
*/
static
struct bt_config_component *bt_config_component_create(
- enum bt_component_class_type type,
+ bt_component_class_type type,
const char *plugin_name, const char *comp_cls_name)
{
struct bt_config_component *cfg_component = NULL;
char *name = NULL;
char *plugin_name = NULL;
char *comp_cls_name = NULL;
- enum bt_component_class_type type;
+ bt_component_class_type type;
plugin_comp_cls_names(arg, &name, &plugin_name, &comp_cls_name, &type);
if (!plugin_name || !comp_cls_name) {
* Destroys a configuration.
*/
static
-void bt_config_destroy(struct bt_object *obj)
+void bt_config_destroy(bt_object *obj)
{
struct bt_config *cfg =
container_of(obj, struct bt_config, base);
goto end;
}
- BT_OBJECT_PUT_REF_AND_RESET(cfg->plugin_paths);
+ BT_VALUE_PUT_REF_AND_RESET(cfg->plugin_paths);
switch (cfg->command) {
case BT_CONFIG_COMMAND_RUN:
* Return value is owned by the caller.
*/
static
-struct bt_value *names_from_arg(const char *arg)
+bt_value *names_from_arg(const char *arg)
{
GScanner *scanner = NULL;
- struct bt_value *names = NULL;
+ bt_value *names = NULL;
bool found_all = false, found_none = false, found_item = false;
names = bt_value_array_create();
return names;
error:
- BT_OBJECT_PUT_REF_AND_RESET(names);
+ BT_VALUE_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)
+bt_value *fields_from_arg(const char *arg)
{
GScanner *scanner = NULL;
- struct bt_value *fields;
+ bt_value *fields;
fields = bt_value_array_create();
if (!fields) {
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(fields);
+ BT_VALUE_PUT_REF_AND_RESET(fields);
end:
if (scanner) {
*/
static
int insert_flat_params_from_array(GString *params_arg,
- const struct bt_value *names_array, const char *prefix)
+ const bt_value *names_array, const char *prefix)
{
int ret = 0;
int i;
}
for (i = 0; i < bt_value_array_get_size(names_array); i++) {
- const struct bt_value *str_obj =
+ const bt_value *str_obj =
bt_value_array_borrow_element_by_index_const(names_array,
i);
const char *suffix;
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)
+ bt_value *instance_names)
{
int ret = 0;
}
static
-int append_env_var_plugin_paths(struct bt_value *plugin_paths)
+int append_env_var_plugin_paths(bt_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(bt_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,
- const struct bt_value *initial_plugin_paths,
+ const bt_value *initial_plugin_paths,
bool needs_plugins)
{
struct bt_config *cfg;
cfg->command_needs_plugins = needs_plugins;
if (initial_plugin_paths) {
- struct bt_value *initial_plugin_paths_copy;
+ bt_value *initial_plugin_paths_copy;
- (void) bt_value_copy(&initial_plugin_paths_copy,
- initial_plugin_paths);
+ (void) bt_value_copy(initial_plugin_paths,
+ &initial_plugin_paths_copy);
cfg->plugin_paths = initial_plugin_paths_copy;
} else {
cfg->plugin_paths = bt_value_array_create();
static
struct bt_config *bt_config_run_create(
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg;
static
struct bt_config *bt_config_list_plugins_create(
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg;
static
struct bt_config *bt_config_help_create(
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg;
static
struct bt_config *bt_config_query_create(
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg;
static
struct bt_config *bt_config_print_ctf_metadata_create(
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg;
static
struct bt_config *bt_config_print_lttng_live_sessions_create(
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg;
static
int bt_config_append_plugin_paths_check_setuid_setgid(
- struct bt_value *plugin_paths, const char *arg)
+ bt_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,
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
poptContext pc = NULL;
char *arg = NULL;
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,
- const struct bt_value *initial_plugin_paths)
+ const bt_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;
+ bt_value *params;
+
+ params = bt_value_null;
+ bt_value_get_ref(bt_value_null);
*retcode = 0;
cfg = bt_config_query_create(initial_plugin_paths);
break;
case OPT_PARAMS:
{
- bt_object_put_ref(params);
+ bt_value_put_ref(params);
params = bt_value_from_arg(arg);
if (!params) {
printf_err("Invalid format for --params option's argument:\n %s\n",
poptFreeContext(pc);
}
- bt_object_put_ref(params);
+ bt_value_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,
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
poptContext pc = NULL;
char *arg = NULL;
fprintf(fp, " in the plugin PLUGIN, add it to the graph,\n");
fprintf(fp, " and optionally name it NAME (you can also\n");
fprintf(fp, " specify the name with --name)\n");
- fprintf(fp, " -C, --connect=CONNECTION Connect two created components (see the\n");
+ fprintf(fp, " -x, --connect=CONNECTION Connect two created components (see the\n");
fprintf(fp, " expected format of CONNECTION below)\n");
fprintf(fp, " --key=KEY Set the current initialization string\n");
fprintf(fp, " parameter key to KEY (see --value)\n");
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,
- const struct bt_value *initial_plugin_paths)
+ const bt_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;
+ bt_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;
+ bt_value *instance_names = NULL;
+ bt_value *connection_args = NULL;
GString *cur_param_key = NULL;
char error_buf[256] = { 0 };
long retry_duration = -1;
- enum bt_value_status status;
+ 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 },
- { "connect", 'C', POPT_ARG_STRING, NULL, OPT_CONNECT, NULL, NULL },
+ { "connect", 'x', POPT_ARG_STRING, NULL, OPT_CONNECT, NULL, NULL },
{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
{ "key", '\0', POPT_ARG_STRING, NULL, OPT_KEY, NULL, NULL },
{ "name", 'n', POPT_ARG_STRING, NULL, OPT_NAME, NULL, NULL },
}
BT_ASSERT(cur_base_params);
- bt_object_put_ref(cur_cfg_comp->params);
- status = bt_value_copy(
- &cur_cfg_comp->params,
- cur_base_params);
+ bt_value_put_ref(cur_cfg_comp->params);
+ status = bt_value_copy(cur_base_params,
+ &cur_cfg_comp->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;
+ bt_value *params;
+ bt_value *params_to_set;
if (!cur_cfg_comp) {
printf_err("Cannot add parameters to unavailable component:\n %s\n",
goto error;
}
- status = bt_value_map_extend(¶ms_to_set,
- cur_cfg_comp->params,
- params);
- BT_OBJECT_PUT_REF_AND_RESET(params);
+ status = bt_value_map_extend(cur_cfg_comp->params,
+ params, ¶ms_to_set);
+ BT_VALUE_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);
break;
case OPT_BASE_PARAMS:
{
- struct bt_value *params =
+ bt_value *params =
bt_value_from_arg(arg);
if (!params) {
break;
}
case OPT_RESET_BASE_PARAMS:
- BT_OBJECT_PUT_REF_AND_RESET(cur_base_params);
+ BT_VALUE_PUT_REF_AND_RESET(cur_base_params);
cur_base_params = bt_value_map_create();
if (!cur_base_params) {
print_err_oom();
free(arg);
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);
+ BT_VALUE_PUT_REF_AND_RESET(cur_base_params);
+ BT_VALUE_PUT_REF_AND_RESET(instance_names);
+ BT_VALUE_PUT_REF_AND_RESET(connection_args);
return cfg;
}
static
-struct bt_config *bt_config_run_from_args_array(const struct bt_value *run_args,
+struct bt_config *bt_config_run_from_args_array(const bt_value *run_args,
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path,
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *cfg = NULL;
const char **argv;
goto end;
}
for (i = 0; i < len; i++) {
- const struct bt_value *arg_value =
+ const bt_value *arg_value =
bt_value_array_borrow_element_by_index_const(run_args,
i);
const char *arg;
static
GString *get_component_auto_name(const char *prefix,
- const struct bt_value *existing_names)
+ const bt_value *existing_names)
{
unsigned int i = 0;
GString *auto_name = g_string_new(NULL);
GString *comp_arg;
GString *name_arg;
GString *params_arg;
- struct bt_value *extra_params;
+ bt_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, bt_value *existing_names,
GList **comp_names, bool append_to_comp_names)
{
int ret = 0;
static
int append_run_args_for_implicit_component(
struct implicit_component_args *impl_args,
- struct bt_value *run_args)
+ bt_value *run_args)
{
int ret = 0;
size_t i;
for (i = 0; i < bt_value_array_get_size(impl_args->extra_params);
i++) {
- const struct bt_value *elem;
+ const bt_value *elem;
const char *arg;
elem = bt_value_array_borrow_element_by_index(impl_args->extra_params,
g_string_free(args->params_arg, TRUE);
}
- bt_object_put_ref(args->extra_params);
+ bt_value_put_ref(args->extra_params);
}
static
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,
+ bt_value *run_args,
+ bt_value *all_names,
GList **source_names, GList **filter_names,
GList **sink_names)
{
* function.
*/
static
-int append_connect_arg(struct bt_value *run_args,
+int append_connect_arg(bt_value *run_args,
const char *upstream_name, const char *downstream_name)
{
int ret = 0;
* 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(bt_value *run_args,
GList *source_names, GList *filter_names,
GList *sink_names)
{
{
int ret = 0;
GList *leftover;
- enum bt_value_status status;
+ 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_OBJECT_PUT_REF_AND_RESET(impl_args->extra_params);
- status = bt_value_copy(&impl_args->extra_params,
- base_implicit_ctf_input_args->extra_params);
+ BT_VALUE_PUT_REF_AND_RESET(impl_args->extra_params);
+ status = bt_value_copy(base_implicit_ctf_input_args->extra_params,
+ &impl_args->extra_params);
if (status != BT_VALUE_STATUS_OK) {
print_err_oom();
destroy_implicit_component_args(impl_args);
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,
- const struct bt_value *initial_plugin_paths, char *log_level)
+ const bt_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;
+ bt_value *run_args = NULL;
+ bt_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_value *plugin_paths;
char error_buf[256] = { 0 };
size_t i;
struct bt_common_lttng_live_url_parts lttng_live_url_parts = { 0 };
char *output = NULL;
- (void) bt_value_copy(&plugin_paths, initial_plugin_paths);
+ (void) bt_value_copy(initial_plugin_paths, &plugin_paths);
*retcode = 0;
switch (opt) {
case OPT_COMPONENT:
{
- enum bt_component_class_type type;
+ bt_component_class_type type;
const char *type_prefix;
/* Append current component's name if needed */
append_implicit_component_param(
&implicit_text_args, "clock-gmt", "yes");
append_implicit_component_param(
- &implicit_trimmer_args, "clock-gmt", "yes");
+ &implicit_trimmer_args, "gmt", "yes");
implicit_text_args.exists = true;
break;
case OPT_CLOCK_OFFSET:
break;
case OPT_FIELDS:
{
- struct bt_value *fields = fields_from_arg(arg);
+ bt_value *fields = fields_from_arg(arg);
if (!fields) {
goto error;
ret = insert_flat_params_from_array(
implicit_text_args.params_arg,
fields, "field");
- bt_object_put_ref(fields);
+ bt_value_put_ref(fields);
if (ret) {
goto error;
}
}
case OPT_NAMES:
{
- struct bt_value *names = names_from_arg(arg);
+ bt_value *names = names_from_arg(arg);
if (!names) {
goto error;
ret = insert_flat_params_from_array(
implicit_text_args.params_arg,
names, "name");
- bt_object_put_ref(names);
+ bt_value_put_ref(names);
if (ret) {
goto error;
}
}
for (i = 0; i < bt_value_array_get_size(run_args); i++) {
- const struct bt_value *arg_value =
+ const bt_value *arg_value =
bt_value_array_borrow_element_by_index(run_args,
i);
const char *arg;
g_ptr_array_free(implicit_ctf_inputs_args, TRUE);
}
- bt_object_put_ref(run_args);
- bt_object_put_ref(all_names);
+ bt_value_put_ref(run_args);
+ bt_value_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_object_put_ref(plugin_paths);
+ bt_value_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,
- const struct bt_value *initial_plugin_paths)
+ const bt_value *initial_plugin_paths)
{
struct bt_config *config = NULL;
int i;
goto end;
}
} else {
- bt_object_get_ref(initial_plugin_paths);
+ bt_value_get_ref(initial_plugin_paths);
}
if (argc <= 1) {
}
end:
- bt_object_put_ref(initial_plugin_paths);
+ bt_value_put_ref(initial_plugin_paths);
return config;
}
projects / babeltrace.git / blobdiff