}
end:
- BT_OBJECT_PUT_REF_AND_RESET(value);
+ BT_VALUE_PUT_REF_AND_RESET(value);
return ret;
}
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(state.params);
+ BT_VALUE_PUT_REF_AND_RESET(state.params);
end:
if (state.scanner) {
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:
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 names;
error:
- BT_OBJECT_PUT_REF_AND_RESET(names);
+ BT_VALUE_PUT_REF_AND_RESET(names);
if (scanner) {
g_scanner_destroy(scanner);
}
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(fields);
+ BT_VALUE_PUT_REF_AND_RESET(fields);
end:
if (scanner) {
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;
}
}
BT_ASSERT(cur_base_params);
- bt_object_put_ref(cur_cfg_comp->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) {
status = bt_value_map_extend(cur_cfg_comp->params,
params, ¶ms_to_set);
- BT_OBJECT_PUT_REF_AND_RESET(params);
+ 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_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;
}
g_string_free(args->params_arg, TRUE);
}
- bt_object_put_ref(args->extra_params);
+ bt_value_put_ref(args->extra_params);
}
static
* 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);
+ 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) {
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;
}
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;
}
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;
}
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;
}